Skip to content

G
gassafety
Commit 0841d9cd authored by 王晓倩's avatar 王晓倩
Browse files
Options

隐患信息增加处理状态和上报时间检索条件，修改页对齐

parent 2e553eff
Hide whitespace changes
Inline Side-by-side
Showing with 389 additions and 90 deletions
gassafety-admin/src/main/java/com/zehong/web/controller/riskManagement/THiddenTroubleController.java
View file @ 0841d9cd
......@@ -2,6 +2,7 @@ package com.zehong.web.controller.riskManagement;
import java.util.List;
import com.zehong.system.domain.form.HiddenTroubleForm;
import com.zehong.system.domain.vo.HiddenTroubleVo;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.beans.factory.annotation.Autowired;
......@@ -40,10 +41,10 @@ public class THiddenTroubleController extends BaseController
*/
@PreAuthorize("@ss.hasPermi('riskManagement:hiddenTrouble:list')")
@GetMapping("/list")
public TableDataInfo list(THiddenTrouble tHiddenTrouble)
public TableDataInfo list(HiddenTroubleForm hiddenTroubleForm)
{
startPage();
List<HiddenTroubleVo> list = tHiddenTroubleService.selectTHiddenTroubleList(tHiddenTrouble);
List<HiddenTroubleVo> list = tHiddenTroubleService.selectTHiddenTroubleList(hiddenTroubleForm);
return getDataTable(list);
}
......@@ -65,10 +66,10 @@ public class THiddenTroubleController extends BaseController
@PreAuthorize("@ss.hasPermi('riskManagement:hiddenTrouble:export')")
@Log(title = "隐患信息", businessType = BusinessType.EXPORT)
@GetMapping("/export")
public AjaxResult export(THiddenTrouble tHiddenTrouble)
public AjaxResult export(HiddenTroubleForm hiddenTroubleForm)
{
tHiddenTrouble.setDealStatus("3");
List<HiddenTroubleVo> list = tHiddenTroubleService.selectTHiddenTroubleList(tHiddenTrouble);
hiddenTroubleForm.setDealStatus("3");
List<HiddenTroubleVo> list = tHiddenTroubleService.selectTHiddenTroubleList(hiddenTroubleForm);
ExcelUtil<HiddenTroubleVo> util = new ExcelUtil<HiddenTroubleVo>(HiddenTroubleVo.class);
return util.exportExcel(list, "隐患信息数据");
}
......
gassafety-system/src/main/java/com/zehong/system/domain/form/HiddenTroubleForm.java 0 → 100644
View file @ 0841d9cd
package com.zehong.system.domain.form;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.zehong.common.annotation.Excel;
import com.zehong.common.core.domain.BaseEntity;
import org.apache.commons.lang3.builder.ToStringBuilder;
import org.apache.commons.lang3.builder.ToStringStyle;
import java.math.BigDecimal;
import java.util.Date;
/**
* 隐患信息对象 t_hidden_trouble
*
* @author zehong
* @date 2021-08-20
*/
public class HiddenTroubleForm extends BaseEntity
{
private static final long serialVersionUID = 1L;
/** 隐患信息id */
private Integer troubleId;
/** 隐患类型 */
@Excel(name = "隐患类型")
private String troubleType;
/** 隐患名称 */
@Excel(name = "隐患名称")
private String troubleName;
/** 隐患级别 */
@Excel(name = "隐患级别")
private String troubleLevel;
/** 工单id */
@Excel(name = "工单id")
private String orderId;
/** 设备id */
@Excel(name = "设备id")
private Integer deviceId;
/** 设备类型（0管道，1调压阀，2阀门井，3流量计，4压力表） */
@Excel(name = "设备类型", readConverterExp = "0=管道，1调压阀，2阀门井，3流量计，4压力表")
private String deviceType;
/** 经度 */
@Excel(name = "经度")
private BigDecimal longitude;
/** 纬度 */
@Excel(name = "纬度")
private BigDecimal latitude;
/** 是否作废（0正常，1作废） */
@Excel(name = "是否作废（0正常，1作废）")
private String isDel;
/** 处理状态（1不需处理，2已处理完成，3未处理完成） */
@Excel(name = "处理状态", readConverterExp = "1不需处理，2已处理完成，3未处理完成")
private String dealStatus;
/** 地址 */
@Excel(name = "地址")
private String address;
/** 备注 */
@Excel(name = "备注")
private String remarks;
/** 图片地址 */
@Excel(name = "图片地址")
private String pictureUrl;
/** 上报人（用户id） */
@Excel(name = "上报人", readConverterExp = "用户id")
private Long reportMan;
/** 创建起始时间 */
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date startCreateTime;
/** 创建截止时间 */
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date endCreateTime;
public void setTroubleId(Integer troubleId)
{
this.troubleId = troubleId;
}
public Integer getTroubleId()
{
return troubleId;
}
public String getTroubleName() {
return troubleName;
}
public void setTroubleName(String troubleName) {
this.troubleName = troubleName;
}
public void setTroubleType(String troubleType)
{
this.troubleType = troubleType;
}
public String getTroubleType()
{
return troubleType;
}
public void setDeviceId(Integer deviceId)
{
this.deviceId = deviceId;
}
public Integer getDeviceId()
{
return deviceId;
}
public void setTroubleLevel(String troubleLevel)
{
this.troubleLevel = troubleLevel;
}
public String getTroubleLevel()
{
return troubleLevel;
}
public void setOrderId(String orderId)
{
this.orderId = orderId;
}
public String getOrderId()
{
return orderId;
}
public void setLongitude(BigDecimal longitude)
{
this.longitude = longitude;
}
public BigDecimal getLongitude()
{
return longitude;
}
public void setDeviceType(String deviceType)
{
this.deviceType = deviceType;
}
public String getDeviceType()
{
return deviceType;
}
public void setLatitude(BigDecimal latitude)
{
this.latitude = latitude;
}
public BigDecimal getLatitude()
{
return latitude;
}
public String getIsDel() {
return isDel;
}
public void setIsDel(String isDel) {
this.isDel = isDel;
}
public void setDealStatus(String dealStatus)
{
this.dealStatus = dealStatus;
}
public String getDealStatus()
{
return dealStatus;
}
public void setAddress(String address)
{
this.address = address;
}
public String getAddress()
{
return address;
}
public void setRemarks(String remarks)
{
this.remarks = remarks;
}
public String getRemarks()
{
return remarks;
}
public void setPictureUrl(String pictureUrl)
{
this.pictureUrl = pictureUrl;
}
public String getPictureUrl()
{
return pictureUrl;
}
public void setReportMan(Long reportMan)
{
this.reportMan = reportMan;
}
public Long getReportMan()
{
return reportMan;
}
public Date getStartCreateTime() {
return startCreateTime;
}
public void setStartCreateTime(Date startCreateTime) {
this.startCreateTime = startCreateTime;
}
public Date getEndCreateTime() {
return endCreateTime;
}
public void setEndCreateTime(Date endCreateTime) {
this.endCreateTime = endCreateTime;
}
@Override
public String toString() {
return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
.append("troubleId", getTroubleId())
.append("troubleType", getTroubleType())
.append("deviceId", getDeviceId())
.append("troubleLevel", getTroubleLevel())
.append("orderId", getOrderId())
.append("longitude", getLongitude())
.append("deviceType", getDeviceType())
.append("latitude", getLatitude())
.append("dealStatus", getDealStatus())
.append("updateTime", getUpdateTime())
.append("address", getAddress())
.append("createTime", getCreateTime())
.append("remarks", getRemarks())
.append("pictureUrl", getPictureUrl())
.append("reportMan", getReportMan())
.toString();
}
}
gassafety-system/src/main/java/com/zehong/system/mapper/THiddenTroubleMapper.java
View file @ 0841d9cd
......@@ -2,6 +2,7 @@ package com.zehong.system.mapper;
import java.util.List;
import com.zehong.system.domain.THiddenTrouble;
import com.zehong.system.domain.form.HiddenTroubleForm;
/**
* 隐患信息Mapper接口
......@@ -22,10 +23,10 @@ public interface THiddenTroubleMapper
/**
* 查询隐患信息列表
*
* @param tHiddenTrouble 隐患信息
* @param hiddenTroubleForm 隐患信息
* @return 隐患信息集合
*/
public List<THiddenTrouble> selectTHiddenTroubleList(THiddenTrouble tHiddenTrouble);
public List<THiddenTrouble> selectTHiddenTroubleList(HiddenTroubleForm hiddenTroubleForm);
/**
* 地图显示隐患信息列表
......
gassafety-system/src/main/java/com/zehong/system/service/ITHiddenTroubleService.java
View file @ 0841d9cd
......@@ -2,6 +2,7 @@ package com.zehong.system.service;
import java.util.List;
import com.zehong.system.domain.THiddenTrouble;
import com.zehong.system.domain.form.HiddenTroubleForm;
import com.zehong.system.domain.vo.HiddenTroubleVo;
/**
......@@ -23,10 +24,10 @@ public interface ITHiddenTroubleService
/**
* 查询隐患信息列表
*
* @param tHiddenTrouble 隐患信息
* @param hiddenTroubleForm 隐患信息
* @return 隐患信息集合
*/
public List<HiddenTroubleVo> selectTHiddenTroubleList(THiddenTrouble tHiddenTrouble);
public List<HiddenTroubleVo> selectTHiddenTroubleList(HiddenTroubleForm hiddenTroubleForm);
/**
* 地图显示隐患信息列表
......
gassafety-system/src/main/java/com/zehong/system/service/impl/THiddenTroubleServiceImpl.java
View file @ 0841d9cd
......@@ -8,6 +8,7 @@ import com.zehong.common.core.domain.entity.SysUser;
import com.zehong.common.utils.DateUtils;
import com.zehong.common.utils.StringUtils;
import com.zehong.system.domain.*;
import com.zehong.system.domain.form.HiddenTroubleForm;
import com.zehong.system.domain.vo.HiddenTroubleVo;
import com.zehong.system.mapper.*;
import com.zehong.system.service.ISysDictTypeService;
......@@ -85,14 +86,14 @@ public class THiddenTroubleServiceImpl implements ITHiddenTroubleService
/**
* 查询隐患信息列表
*
* @param tHiddenTrouble 隐患信息
* @param hiddenTroubleForm 隐患信息
* @return 隐患信息
*/
@Override
public List<HiddenTroubleVo> selectTHiddenTroubleList(THiddenTrouble tHiddenTrouble)
public List<HiddenTroubleVo> selectTHiddenTroubleList(HiddenTroubleForm hiddenTroubleForm)
{
List<HiddenTroubleVo> list = new ArrayList<>();
List<THiddenTrouble> tHiddenTroubleList = tHiddenTroubleMapper.selectTHiddenTroubleList(tHiddenTrouble);
List<THiddenTrouble> tHiddenTroubleList = tHiddenTroubleMapper.selectTHiddenTroubleList(hiddenTroubleForm);
if(tHiddenTroubleList.size() != 0) {
for (THiddenTrouble trouble : tHiddenTroubleList) {
......
gassafety-system/src/main/resources/mapper/system/THiddenTroubleMapper.xml
View file @ 0841d9cd
......@@ -28,7 +28,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
select trouble_id, trouble_name, trouble_type, device_id, trouble_level, order_id, longitude, device_type, latitude, is_del, deal_status, update_time, address, create_time, remarks, picture_url, report_man from t_hidden_trouble
</sql>
<select id="selectTHiddenTroubleList" parameterType="THiddenTrouble" resultMap="THiddenTroubleResult">
<select id="selectTHiddenTroubleList" parameterType="HiddenTroubleForm" resultMap="THiddenTroubleResult">
<include refid="selectTHiddenTroubleVo"/>
<where>
and is_del = '0'
......@@ -40,11 +40,15 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="longitude != null "> and longitude = #{longitude}</if>
<if test="deviceType != null and deviceType != ''"> and device_type = #{deviceType}</if>
<if test="latitude != null "> and latitude = #{latitude}</if>
<if test="dealStatus != null and dealStatus != ''"> and deal_status = #{dealStatus}</if>
<if test="dealStatus != null and dealStatus != '' and dealStatus != 0 and dealStatus != -1"> and deal_status = #{dealStatus}</if>
<if test="dealStatus == -1"> and order_id is null</if>
<if test="dealStatus == 0"> and order_id is not null and deal_status is null</if>
<if test="address != null and address != ''"> and address = #{address}</if>
<if test="remarks != null and remarks != ''"> and remarks = #{remarks}</if>
<if test="pictureUrl != null and pictureUrl != ''"> and picture_url = #{pictureUrl}</if>
<if test="reportMan != null "> and report_man = #{reportMan}</if>
<if test="startCreateTime != null "> and create_time &gt;= #{startCreateTime}</if>
<if test="endCreateTime != null "> and create_time &lt;= #{endCreateTime}</if>
</where>
order by create_time desc
</select>
......
gassafety-web/src/views/dataMonitoring/deviceAlarm/index.vue
View file @ 0841d9cd
......@@ -157,10 +157,10 @@
<font>{{ form.alarmValue }}</font>
</el-form-item>
<el-form-item label="工单名称" prop="orderName">
<el-input v-model="form.orderName" placeholder="请输入工单名称" />
<el-input v-model="form.orderName" placeholder="请输入工单名称" style="width: 590px" />
</el-form-item>
<el-form-item label="指定执行人员" prop="appointInspector">
<el-select v-model="form.appointInspector" placeholder="请选择执行人员" clearable size="small" @change="setUserId">
<el-select v-model="form.appointInspector" placeholder="请选择执行人员" clearable size="small" @change="setUserId" style="width: 590px">
<el-option
v-for="item in inspector"
:key="item.userId"
......@@ -170,7 +170,7 @@
</el-select>
</el-form-item>
<el-form-item label="工单描述" prop="remarks">
<el-input type="textarea" v-model="form.remarks" placeholder="请输入工单描述" />
<el-input type="textarea" v-model="form.remarks" placeholder="请输入工单描述" style="width: 590px" />
</el-form-item>
</el-form>
<div slot="footer" class="dialog-footer">
......
gassafety-web/src/views/deviceInspection/inspectionPlan/index.vue
View file @ 0841d9cd
......@@ -57,7 +57,7 @@
<span v-if="scope.row.remarks == null || scope.row.remarks == ''">-</span>
</template>
</el-table-column>
<el-table-column label="计划状态" align="center" prop="planStatus">
<el-table-column label="计划状态" align="center" prop="planStatus" width="200px">
<template slot-scope="scope">
<span v-if="scope.row.planStatus == 0">未生成工单</span>
<span v-if="scope.row.planStatus == 1">已生成工单</span>
......@@ -116,11 +116,15 @@
<!-- 添加或修改巡检计划对话框 -->
<el-dialog :title="title1" :visible.sync="open1" width="800px" append-to-body @close="cancel">
<el-form ref="form1" :model="form1" :rules="rules1" label-width="120px">
<el-col :span="23">
<el-form-item label="巡检计划名称" prop="planName">
<el-input v-model="form1.planName" placeholder="请输入巡检计划名称"/>
<el-input v-model="form1.planName" placeholder="请输入巡检计划名称" style="width: 600px"/>
</el-form-item>
</el-col>
<el-col :span="23">
<el-form-item label="巡检设备" prop="devices">
<el-cascader
placeholder="请选择巡检设备"
v-model="form1.devices"
:options="options"
:props="props"
......@@ -128,9 +132,11 @@
@change="handleChange"
filterable
clearable
style="width: 640px"
style="width: 600px"
></el-cascader>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="开始时间" prop="startTime">
<el-date-picker clearable size="small"
v-model="form1.startTime"
......@@ -139,6 +145,8 @@
placeholder="选择开始时间">
</el-date-picker>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="结束时间" prop="endTime">
<el-date-picker clearable size="small"
v-model="form1.endTime"
......@@ -147,12 +155,17 @@
placeholder="选择结束时间">
</el-date-picker>
</el-form-item>
</el-col>
<el-col :span="23">
<el-form-item label="地址" prop="address">
<el-input v-model="form1.address" type="textarea" placeholder="请输入地址"/>
<el-input v-model="form1.address" type="textarea" placeholder="请输入地址" style="width: 600px"/>
</el-form-item>
</el-col>
<el-col :span="23">
<el-form-item label="计划描述" prop="remarks">
<el-input type="textarea" v-model="form1.remarks" placeholder="请输入计划描述"/>
<el-input type="textarea" v-model="form1.remarks" placeholder="请输入计划描述" style="width: 600px"/>
</el-form-item>
</el-col>
</el-form>
<div slot="footer" class="dialog-footer">
<el-button type="primary" @click="submitForm1">确 定</el-button>
......@@ -160,7 +173,7 @@
</div>
</el-dialog>
<el-dialog :title="title2" :visible.sync="open2" width="800px" append-to-body @close="cancel">
<el-form ref="form2" :model="form2" :rules="rules2" label-width="120px">
<el-form ref="form2" :model="form2" :rules="rules2" label-width="130px">
<el-form-item label="巡检计划名称">
<font>{{form2.planName}}</font>
</el-form-item>
......@@ -172,10 +185,10 @@
<font>{{form2.address}}</font>
</el-form-item>
<el-form-item label="工单名称" prop="orderName">
<el-input v-model="form2.orderName" placeholder="请输入工单名称" />
<el-input v-model="form2.orderName" placeholder="请输入工单名称" style="width: 590px" />
</el-form-item>
<el-form-item label="指定执行人员" prop="appointInspector">
<el-select v-model="form2.appointInspector" placeholder="请选择执行人员" clearable size="small" >
<el-select v-model="form2.appointInspector" placeholder="请选择执行人员" clearable size="small" style="width: 590px" >
<el-option
v-for="item in inspector"
:key="item.userId"
......@@ -185,7 +198,7 @@
</el-select>
</el-form-item>
<el-form-item label="工单描述" prop="remarks">
<el-input type="textarea" v-model="form2.remarks" placeholder="请输入工单描述" />
<el-input type="textarea" v-model="form2.remarks" placeholder="请输入工单描述" style="width: 590px" />
</el-form-item>
</el-form>
<div slot="footer" class="dialog-footer">
......
gassafety-web/src/views/riskManagement/hiddenTrouble/index.vue
View file @ 0841d9cd
......@@ -2,10 +2,10 @@
<div class="app-container">
<el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="100px">
<el-form-item label="隐患名称" prop="troubleName">
<el-input v-model="queryParams.troubleName" placeholder="请输入隐患名称"/>
<el-input v-model="queryParams.troubleName" placeholder="请输入隐患名称" style="width: 170px"/>
</el-form-item>
<el-form-item label="隐患类型" prop="troubleType">
<el-select v-model="queryParams.troubleType" placeholder="请选择隐患类型" clearable size="small">
<el-select v-model="queryParams.troubleType" placeholder="请选择隐患类型" clearable size="small" style="width: 170px">
<el-option
v-for="dict in typeOptions"
:key="dict.dictValue"
......@@ -14,11 +14,38 @@
></el-option>
</el-select>
</el-form-item>
<!--<el-form-item label="状态" prop="dealStatus">
<el-select v-model="queryParams.dealStatus" placeholder="请选择状态" clearable size="small">
<el-option label="" value="0" />
<el-form-item label="处理状态" prop="dealStatus">
<el-select v-model="queryParams.dealStatus" placeholder="请选择状态" clearable size="small" style="width: 170px">
<el-option label="未生成工单" value="-1" />
<el-option label="暂未处理" value="0" />
<el-option label="不需处理" value="1" />
<el-option label="已处理完成" value="2" />
<el-option label="未处理完成" value="3" />
</el-select>
</el-form-item>-->
</el-form-item>
<el-form-item label="上报时间" prop="startCreateTime">
<el-date-picker
clearable size="small"
v-model="queryParams.startCreateTime"
value-format="yyyy-MM-dd HH:mm:ss"
type="datetime"
placeholder="请选择起始时间"
align="right"
style="width: 200px">
</el-date-picker>
<font color="#C0C4CC"> 至</font>
</el-form-item>
<el-form-item label="" prop="endCreateTime">
<el-date-picker
clearable size="small"
v-model="queryParams.endCreateTime"
value-format="yyyy-MM-dd HH:mm:ss"
type="datetime"
placeholder="请选择截止时间"
align="right"
style="width: 200px">
</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>
......@@ -121,14 +148,14 @@
<!-- 添加或修改隐患信息对话框 -->
<el-dialog :title="title1" :visible.sync="open1" width="800px" append-to-body @close="cancel">
<el-form ref="form1" :model="form1" :rules="rules" label-width="120px">
<el-col>
<el-form-item label="隐患名称" prop="troubleName" style="width: 720px">
<el-input v-model="form1.troubleName" placeholder="请输入隐患名称" />
<el-col :span="23">
<el-form-item label="隐患名称" prop="troubleName">
<el-input v-model="form1.troubleName" placeholder="请输入隐患名称" style="width: 600px" />
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="隐患类型" prop="troubleType">
<el-select v-model="form1.troubleType" placeholder="请选择隐患类型">
<el-select v-model="form1.troubleType" placeholder="请选择隐患类型" style="width: 220px">
<el-option
v-for="dict in typeOptions"
:key="dict.dictValue"
......@@ -138,9 +165,9 @@
</el-select>
</el-form-item>
</el-col>
<el-col :span="11">
<el-col :span="12">
<el-form-item label="隐患级别" prop="troubleLevel">
<el-select v-model="form1.troubleLevel" placeholder="请选择隐患级别">
<el-select v-model="form1.troubleLevel" placeholder="请选择隐患级别" style="width: 220px">
<el-option
v-for="dict in levelOptions"
:key="dict.dictValue"
......@@ -152,7 +179,7 @@
</el-col>
<el-col :span="12">
<el-form-item label="上报人" prop="reportMan">
<el-select v-model="form1.reportMan" placeholder="请选择上报人" clearable size="small" >
<el-select v-model="form1.reportMan" placeholder="请选择上报人" style="width: 220px">
<el-option
v-for="item in userList"
:key="item.userId"
......@@ -162,7 +189,7 @@
</el-select>
</el-form-item>
</el-col>
<el-col :span="11">
<el-col :span="12">
<el-form-item label="隐患设备" prop="device">
<el-cascader
v-model="form1.device"
......@@ -172,15 +199,16 @@
@change="handleChange"
filterable
clearable
style="width: 220px"
></el-cascader>
</el-form-item>
</el-col>
<el-col>
<el-form-item label="地址" prop="address" style="width: 720px">
<el-input v-model="form1.address" type="textarea" placeholder="请输入地址" />
<el-col :span="23">
<el-form-item label="地址" prop="address">
<el-input v-model="form1.address" type="textarea" placeholder="请输入地址" style="width: 600px" />
</el-form-item>
</el-col>
<el-col>
<el-col :span="23">
<el-form-item label="经纬度" prop="longitude">
<el-row>
<el-col :span="8">
......@@ -195,7 +223,7 @@
</el-row>
</el-form-item>
</el-col>
<el-col>
<el-col :span="23">
<el-form-item label="图片上传" prop="pictureUrl">
<MyFileUpload
listType="picture-card"
......@@ -206,9 +234,9 @@
<el-input v-show="false" disabled v-model="form1.pictureUrl"></el-input>
</el-form-item>
</el-col>
<el-col>
<el-form-item label="隐患信息" prop="remarks" style="width: 720px">
<el-input v-model="form1.remarks" type="textarea" placeholder="请输入隐患信息" />
<el-col :span="23">
<el-form-item label="隐患信息" prop="remarks">
<el-input v-model="form1.remarks" type="textarea" placeholder="请输入隐患信息" style="width: 600px" />
</el-form-item>
</el-col>
</el-form>
......@@ -231,8 +259,8 @@
<font v-if="form2.troubleLevel == 2">Ⅱ级</font>
<font v-if="form2.troubleLevel == 3">Ⅲ级</font>
</el-form-item>
<el-form-item label="工单名称" prop="orderName" style="width: 720px">
<el-input v-model="form2.orderName" placeholder="请输入工单名称" />
<el-form-item label="工单名称" prop="orderName">
<el-input v-model="form2.orderName" placeholder="请输入工单名称" style="width: 600px" />
</el-form-item>
<el-form-item label="指定执行人员" prop="appointInspector" >
<el-select v-model="form2.appointInspector" placeholder="请选择执行人员" clearable size="small" style="width: 600px">
......@@ -244,8 +272,8 @@
></el-option>
</el-select>
</el-form-item>
<el-form-item label="工单描述" prop="remarks" style="width: 720px">
<el-input type="textarea" v-model="form2.remarks" placeholder="请输入工单描述" />
<el-form-item label="工单描述" prop="remarks">
<el-input type="textarea" v-model="form2.remarks" placeholder="请输入工单描述" style="width: 600px" />
</el-form-item>
</el-form>
<div slot="footer" class="dialog-footer">
......@@ -339,6 +367,8 @@ export default {
deviceType: null,
latitude: null,
dealStatus: null,
startCreateTime: null,
endCreateTime: null,
address: null,
remarks: null,
pictureUrl: null,
......
gassafety-web/src/views/workOrder/basicsInfo/index.vue
View file @ 0841d9cd
......@@ -59,6 +59,7 @@
<el-table v-loading="loading" :data="basicsInfoList.slice((pageNum-1)*pageSize,pageNum*pageSize)" @selection-change="handleSelectionChange">
<el-table-column label="工单编号" align="center" prop="orderId" />
<el-table-column label="工单名称" align="center" prop="orderName" width="350px"/>
<el-table-column label="工单类型" align="center" prop="orderType" >
<template slot-scope="scope">
<el-button type="primary" v-if="scope.row.orderType == 1">巡检信息</el-button>
......@@ -66,32 +67,24 @@
<el-button type="danger" v-if="scope.row.orderType == 3">报警信息</el-button>
</template>
</el-table-column>
<el-table-column label="指定执行人员" align="center" prop="appointInspectorName">
</el-table-column>
<el-table-column label="工单名称" align="center" prop="orderName" />
<el-table-column label="工单状态" align="center" prop="orderStatus" >
<template slot-scope="scope">
<span type="info" v-if="scope.row.orderStatus == 0">未接收</span>
<span type="warning" v-if="scope.row.orderStatus == 1">已接收</span>
<span type="primary" v-if="scope.row.orderStatus == 2">已反馈</span>
<span type="success" v-if="scope.row.orderStatus == 3">已归档</span>
</template>
</el-table-column>
<el-table-column label="创建时间" align="center" prop="allotTime" width="180">
<el-table-column label="指定执行人员" align="center" prop="appointInspectorName" />
<el-table-column label="创建时间" align="center" prop="allotTime">
<template slot-scope="scope">
<span>{{ parseTime(scope.row.allotTime) }}</span>
</template>
</el-table-column>
<el-table-column label="更新时间" align="center" prop="actualTime" width="180">
<el-table-column label="更新时间" align="center" prop="actualTime">
<template slot-scope="scope">
<span v-if="scope.row.actualTime != null">{{ scope.row.actualTime }}</span>
<span v-if="scope.row.actualTime == null">-</span>
</template>
</el-table-column>
<el-table-column label="工单描述" align="center" prop="remarks" >
<el-table-column label="工单状态" align="center" prop="orderStatus" >
<template slot-scope="scope">
<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>
<span type="info" v-if="scope.row.orderStatus == 0">未接收</span>
<span type="warning" v-if="scope.row.orderStatus == 1">已接收</span>
<span type="primary" v-if="scope.row.orderStatus == 2">已反馈</span>
<span type="success" v-if="scope.row.orderStatus == 3">已归档</span>
</template>
</el-table-column>
<el-table-column label="操作" align="center" class-name="small-padding fixed-width">
......@@ -132,14 +125,14 @@
<!-- 归档或修改工单基础信息对话框 -->
<el-dialog :title="title" :visible.sync="open" width="800px" append-to-body>
<el-dialog :title="title" :visible.sync="open" width="800px" append-to-body @close="cancel">
<el-form ref="form" :model="form" :rules="rules" label-width="120px">
<div v-if="this.title == '工单信息修改'">
<el-form-item label="工单名称" prop="orderName">
<el-input v-model="form.orderName" placeholder="请输入工单名称" />
<el-input v-model="form.orderName" placeholder="请输入工单名称" style="width: 600px" />
</el-form-item>
<el-form-item label="指定执行人员" prop="appointInspector">
<el-select v-model="form.appointInspector" placeholder="请选择执行人员" clearable size="small" @change="setUserId">
<el-select v-model="form.appointInspector" placeholder="请选择执行人员" clearable size="small" @change="setUserId" style="width: 600px">
<el-option
v-for="item in inspector"
:key="item.userId"
......@@ -149,7 +142,7 @@
</el-select>
</el-form-item>
<el-form-item label="工单描述" prop="remarks">
<el-input v-model="form.remarks" type="textarea" placeholder="请输入工单描述" />
<el-input v-model="form.remarks" type="textarea" placeholder="请输入工单描述" style="width: 600px" />
</el-form-item>
</div>
<div v-if="this.title == '工单信息归档'">
......@@ -165,7 +158,7 @@
<font>{{form.orderId}}</font>
</el-form-item>
<el-form-item label="归档信息" prop="archiving">
<el-input v-model="form.archiving" type="textarea" placeholder="请输入归档信息" />
<el-input v-model="form.archiving" type="textarea" placeholder="请输入归档信息" style="width: 600px" />
</el-form-item>
</div>
</el-form>
......
gassafety-web/src/views/workOrder/feedback/index.vue
View file @ 0841d9cd
......@@ -59,6 +59,7 @@
<el-table v-loading="loading" :data="basicsInfoList.slice((pageNum-1)*pageSize,pageNum*pageSize)" @selection-change="handleSelectionChange">
<el-table-column label="工单编号" align="center" prop="orderId" />
<el-table-column label="工单名称" align="center" prop="orderName" width="350px"/>
<el-table-column label="工单类型" align="center" prop="orderType" >
<template slot-scope="scope">
<span type="primary" v-if="scope.row.orderType == 1">巡检信息</span>
......@@ -66,30 +67,23 @@
<span type="primary" v-if="scope.row.orderType == 3">报警信息</span>
</template>
</el-table-column>
<el-table-column label="工单名称" align="center" prop="orderName" />
<el-table-column label="工单状态" align="center" prop="orderStatus" >
<template slot-scope="scope">
<el-button type="info" v-if="scope.row.orderStatus == 0">未接收</el-button>
<el-button type="warning" v-if="scope.row.orderStatus == 1">已接收</el-button>
<el-button type="primary" v-if="scope.row.orderStatus == 2">已反馈</el-button>
<el-button type="success" v-if="scope.row.orderStatus == 3">已归档</el-button>
</template>
</el-table-column>
<el-table-column label="创建时间" align="center" prop="allotTime" width="180">
<el-table-column label="创建时间" align="center" prop="allotTime">
<template slot-scope="scope">
<span>{{ parseTime(scope.row.allotTime) }}</span>
</template>
</el-table-column>
<el-table-column label="更新时间" align="center" prop="actualTime" width="180">
<el-table-column label="更新时间" align="center" prop="actualTime">
<template slot-scope="scope">
<span v-if="scope.row.actualTime != null">{{ scope.row.actualTime }}</span>
<span v-if="scope.row.actualTime == null">-</span>
</template>
</el-table-column>
<el-table-column label="工单描述" align="center" prop="remarks" >
<el-table-column label="工单状态" align="center" prop="orderStatus" >
<template slot-scope="scope">
<span v-if="scope.row.remarks != null">{{ scope.row.remarks }}</span>
<span v-if="scope.row.remarks == null">-</span>
<el-button type="info" v-if="scope.row.orderStatus == 0">未接收</el-button>
<el-button type="warning" v-if="scope.row.orderStatus == 1">已接收</el-button>
<el-button type="primary" v-if="scope.row.orderStatus == 2">已反馈</el-button>
<el-button type="success" v-if="scope.row.orderStatus == 3">已归档</el-button>
</template>
</el-table-column>
<el-table-column label="操作" align="center" class-name="small-padding fixed-width">
......@@ -130,7 +124,7 @@
<!-- 工单反馈对话框 -->
<el-dialog :title="title" :visible.sync="open" width="800px" append-to-body @close="cancel">
<el-form ref="form" :model="form" :rules="rules" label-width="100px">
<el-form ref="form" :model="form" :rules="rules" label-width="120px">
<el-form-item label="工单名称" prop="orderName">
<font>{{form.orderName}}</font>
</el-form-item>
......@@ -143,7 +137,7 @@
<font>{{form.orderId}}</font>
</el-form-item>
<el-form-item label="设备列表" prop="deviceId" v-if="form.orderType == '1'">
<el-select v-model="form.deviceId" placeholder="请选择设备" clearable size="small" filterable >
<el-select v-model="form.deviceId" placeholder="请选择设备" clearable size="small" filterable style="width: 600px" >
<el-option
v-for="device in form.deviceInfoList"
:key="device.deviceId"
......@@ -175,7 +169,7 @@
</el-radio-group>
</el-form-item>
<el-form-item label="反馈信息" prop="contents">
<el-input v-model="form.contents" type="textarea" placeholder="请输入反馈信息" />
<el-input v-model="form.contents" type="textarea" placeholder="请输入反馈信息" style="width: 600px" />
</el-form-item>
</el-form>
<div slot="footer" class="dialog-footer">
......
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