Skip to content

Z
zhmes-agecal
Commit 984865fe authored by 王晓倩's avatar 王晓倩
Browse files
Options

老化层记录老化开始时间，老化柜、托盘、报警信息初始页面

parent 1c3cf716
Show whitespace changes
Inline Side-by-side
Showing with 1190 additions and 10 deletions
zhmes-agecal-admin/src/main/java/com/zehong/web/controller/equipment/EquipmentDataCollection.java
View file @ 984865fe
...@@ -55,7 +55,7 @@ public class EquipmentDataCollection { ...@@ -55,7 +55,7 @@ public class EquipmentDataCollection {
receiveMsg1 = agingCabinetCommunication(info, sendMsg1); receiveMsg1 = agingCabinetCommunication(info, sendMsg1);
if (receiveMsg1 == null || receiveMsg1.length() != 58) { if (receiveMsg1 == null || receiveMsg1.length() != 58) {
// 记录异常数据 // 记录异常数据
alarmData.setfAlarmType("01"); // 01.老化柜 02.标定柜 03.机械臂 04.老化层 05.点位 alarmData.setfAlarmType("01"); //01.老化柜 02.机械臂 03.老化层 04.点位
alarmData.setfEquipmentCode(info.getfEquipmentCode()); alarmData.setfEquipmentCode(info.getfEquipmentCode());
alarmData.setfAlarmData("老化柜通讯失败"); alarmData.setfAlarmData("老化柜通讯失败");
tEquipmentAlarmDataService.insertTEquipmentAlarmData(alarmData); tEquipmentAlarmDataService.insertTEquipmentAlarmData(alarmData);
...@@ -89,7 +89,7 @@ public class EquipmentDataCollection { ...@@ -89,7 +89,7 @@ public class EquipmentDataCollection {
storeyInfo = tStoreyInfoService.selectTStoreyInfoByCode(storeyCode); storeyInfo = tStoreyInfoService.selectTStoreyInfoByCode(storeyCode);
if (storeyInfo == null) { if (storeyInfo == null) {
// 记录异常数据 // 记录异常数据
alarmData.setfAlarmType("01"); // 01.老化柜 02.标定柜 03.机械臂 04.老化层 05.点位 alarmData.setfAlarmType("01"); //01.老化柜 02.机械臂 03.老化层 04.点位
alarmData.setfEquipmentCode(info.getfEquipmentCode()); alarmData.setfEquipmentCode(info.getfEquipmentCode());
alarmData.setfAlarmData("下属" + storeyCode + "号老化层不存在"); alarmData.setfAlarmData("下属" + storeyCode + "号老化层不存在");
tEquipmentAlarmDataService.insertTEquipmentAlarmData(alarmData); tEquipmentAlarmDataService.insertTEquipmentAlarmData(alarmData);
...@@ -107,7 +107,7 @@ public class EquipmentDataCollection { ...@@ -107,7 +107,7 @@ public class EquipmentDataCollection {
tStoreyInfoService.updateTStoreyInfo(storeyInfo); tStoreyInfoService.updateTStoreyInfo(storeyInfo);
} else { } else {
// 记录异常数据 // 记录异常数据
alarmData.setfAlarmType("04"); //01.老化柜 02.标定柜 03.机械臂 04.老化层 05.点位 alarmData.setfAlarmType("03"); //01.老化柜 02.机械臂 03.老化层 04.点位
alarmData.setfEquipmentCode(storeyInfo.getfStoreyCode()); alarmData.setfEquipmentCode(storeyInfo.getfStoreyCode());
alarmData.setfAlarmData("断电失败"); alarmData.setfAlarmData("断电失败");
tEquipmentAlarmDataService.insertTEquipmentAlarmData(alarmData); tEquipmentAlarmDataService.insertTEquipmentAlarmData(alarmData);
...@@ -155,7 +155,7 @@ public class EquipmentDataCollection { ...@@ -155,7 +155,7 @@ public class EquipmentDataCollection {
String receiveMsg1 = agingCabinetCommunication(equipmentInfo, sendMsg1); String receiveMsg1 = agingCabinetCommunication(equipmentInfo, sendMsg1);
if (receiveMsg1 == null || receiveMsg1.length() != 58) { if (receiveMsg1 == null || receiveMsg1.length() != 58) {
// 记录异常数据 // 记录异常数据
alarmData.setfAlarmType("01"); //01.老化柜 02.标定柜 03.机械臂 04.老化层 alarmData.setfAlarmType("01"); //01.老化柜 02.机械臂 03.老化层 04.点位
alarmData.setfEquipmentCode(equipmentInfo.getfEquipmentCode()); alarmData.setfEquipmentCode(equipmentInfo.getfEquipmentCode());
alarmData.setfAlarmData("老化柜通讯失败"); alarmData.setfAlarmData("老化柜通讯失败");
tEquipmentAlarmDataService.insertTEquipmentAlarmData(alarmData); tEquipmentAlarmDataService.insertTEquipmentAlarmData(alarmData);
...@@ -179,7 +179,7 @@ public class EquipmentDataCollection { ...@@ -179,7 +179,7 @@ public class EquipmentDataCollection {
String receiveMsg2 = storeyCommunication(storeyInfo, sendMsg2); String receiveMsg2 = storeyCommunication(storeyInfo, sendMsg2);
if (!sendMsg2.equals(receiveMsg2) || receiveMsg2 == null) { if (!sendMsg2.equals(receiveMsg2) || receiveMsg2 == null) {
// 记录异常数据 // 记录异常数据
alarmData.setfAlarmType("04"); //01.老化柜 02.标定柜 03.机械臂 04.老化层 05.点位 alarmData.setfAlarmType("03"); //01.老化柜 02.机械臂 03.老化层 04.点位
alarmData.setfEquipmentCode(storeyInfo.getfStoreyCode()); alarmData.setfEquipmentCode(storeyInfo.getfStoreyCode());
alarmData.setfAlarmData("上电失败"); alarmData.setfAlarmData("上电失败");
tEquipmentAlarmDataService.insertTEquipmentAlarmData(alarmData); tEquipmentAlarmDataService.insertTEquipmentAlarmData(alarmData);
...@@ -187,6 +187,7 @@ public class EquipmentDataCollection { ...@@ -187,6 +187,7 @@ public class EquipmentDataCollection {
} }
// 老化层更新状态 // 老化层更新状态
storeyInfo.setfStatus("1"); //运行 storeyInfo.setfStatus("1"); //运行
storeyInfo.setfAgingStartTime(new Date()); // 记录老化开始时间
tStoreyInfoService.updateTStoreyInfo(storeyInfo); tStoreyInfoService.updateTStoreyInfo(storeyInfo);
/* 4.老化层通讯，72个点位，1-27一个端口号、28-54一个端口号、55-72一个端口号，IP不变 */ /* 4.老化层通讯，72个点位，1-27一个端口号、28-54一个端口号、55-72一个端口号，IP不变 */
...@@ -195,7 +196,7 @@ public class EquipmentDataCollection { ...@@ -195,7 +196,7 @@ public class EquipmentDataCollection {
String receiveMsg3 = storeyCommunication(storeyInfo, sendMsg3); String receiveMsg3 = storeyCommunication(storeyInfo, sendMsg3);
if (receiveMsg3 == null) { if (receiveMsg3 == null) {
// 记录异常数据 // 记录异常数据
alarmData.setfAlarmType("04"); //01.老化柜 02.标定柜 03.机械臂 04.老化层 05.点位 alarmData.setfAlarmType("03"); //01.老化柜 02.机械臂 03.老化层 04.点位
alarmData.setfEquipmentCode(storeyInfo.getfStoreyCode()); alarmData.setfEquipmentCode(storeyInfo.getfStoreyCode());
alarmData.setfAlarmData("老化层通讯失败，无响应"); alarmData.setfAlarmData("老化层通讯失败，无响应");
tEquipmentAlarmDataService.insertTEquipmentAlarmData(alarmData); tEquipmentAlarmDataService.insertTEquipmentAlarmData(alarmData);
...@@ -228,7 +229,7 @@ public class EquipmentDataCollection { ...@@ -228,7 +229,7 @@ public class EquipmentDataCollection {
String receiveMsgYear = storeyCommunication(storeyInfo, sendMsgYear); String receiveMsgYear = storeyCommunication(storeyInfo, sendMsgYear);
if (!sendMsgYear.equals(receiveMsgYear) || receiveMsgYear == null) { if (!sendMsgYear.equals(receiveMsgYear) || receiveMsgYear == null) {
// 记录异常数据 // 记录异常数据
alarmData.setfAlarmType("05"); //01.老化柜 02.标定柜 03.机械臂 04.老化层 05.点位 alarmData.setfAlarmType("04"); //01.老化柜 02.机械臂 03.老化层 04.点位
alarmData.setfEquipmentCode(storeyInfo.getfStoreyCode()); alarmData.setfEquipmentCode(storeyInfo.getfStoreyCode());
alarmData.setfAlarmData("写入时间失败-年"); alarmData.setfAlarmData("写入时间失败-年");
tEquipmentAlarmDataService.insertTEquipmentAlarmData(alarmData); tEquipmentAlarmDataService.insertTEquipmentAlarmData(alarmData);
......
zhmes-agecal-system/src/main/java/com/zehong/system/domain/TStoreyInfo.java
View file @ 984865fe
...@@ -40,6 +40,11 @@ public class TStoreyInfo extends BaseEntity ...@@ -40,6 +40,11 @@ public class TStoreyInfo extends BaseEntity
@Excel(name = "状态：0空闲，1运行，2故障，3断电") @Excel(name = "状态：0空闲，1运行，2故障，3断电")
private String fStatus; private String fStatus;
/** 老化开始时间 */
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@Excel(name = "更新时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
private Date fAgingStartTime;
/** 更新时间 */ /** 更新时间 */
@JsonFormat(pattern = "yyyy-MM-dd") @JsonFormat(pattern = "yyyy-MM-dd")
@Excel(name = "更新时间", width = 30, dateFormat = "yyyy-MM-dd") @Excel(name = "更新时间", width = 30, dateFormat = "yyyy-MM-dd")
...@@ -110,6 +115,15 @@ public class TStoreyInfo extends BaseEntity ...@@ -110,6 +115,15 @@ public class TStoreyInfo extends BaseEntity
{ {
return fPort; return fPort;
} }
public Date getfAgingStartTime() {
return fAgingStartTime;
}
public void setfAgingStartTime(Date fAgingStartTime) {
this.fAgingStartTime = fAgingStartTime;
}
public void setfUpdateTime(Date fUpdateTime) public void setfUpdateTime(Date fUpdateTime)
{ {
this.fUpdateTime = fUpdateTime; this.fUpdateTime = fUpdateTime;
...@@ -147,6 +161,7 @@ public class TStoreyInfo extends BaseEntity ...@@ -147,6 +161,7 @@ public class TStoreyInfo extends BaseEntity
.append("fIp", getfIp()) .append("fIp", getfIp())
.append("fStatus", getfStatus()) .append("fStatus", getfStatus())
.append("fPort", getfPort()) .append("fPort", getfPort())
.append("fAgingStartTime", getfUpdateTime())
.append("fUpdateTime", getfUpdateTime()) .append("fUpdateTime", getfUpdateTime())
.append("fCreateTime", getfCreateTime()) .append("fCreateTime", getfCreateTime())
.append("fAlarmTime", getfAlarmTime()) .append("fAlarmTime", getfAlarmTime())
......
zhmes-agecal-system/src/main/resources/mapper/system/TStoreyInfoMapper.xml
View file @ 984865fe
...@@ -11,13 +11,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" ...@@ -11,13 +11,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<result property="fIp" column="f_ip" /> <result property="fIp" column="f_ip" />
<result property="fStatus" column="f_status" /> <result property="fStatus" column="f_status" />
<result property="fPort" column="f_port" /> <result property="fPort" column="f_port" />
<result property="fAgingStartTime" column="f_aging_start_time" />
<result property="fUpdateTime" column="f_update_time" /> <result property="fUpdateTime" column="f_update_time" />
<result property="fCreateTime" column="f_create_time" /> <result property="fCreateTime" column="f_create_time" />
<result property="fAlarmTime" column="f_alarm_time" /> <result property="fAlarmTime" column="f_alarm_time" />
</resultMap> </resultMap>
<sql id="selectTStoreyInfoVo"> <sql id="selectTStoreyInfoVo">
select f_storey_id, f_equipment_id, f_storey_code, f_tray_code, f_ip, f_status, f_port, f_update_time, f_create_time, f_alarm_time from t_storey_info select f_storey_id, f_equipment_id, f_storey_code, f_tray_code, f_ip, f_status, f_port, f_aging_start_time, f_update_time, f_create_time, f_alarm_time from t_storey_info
</sql> </sql>
<select id="selectTStoreyInfoList" parameterType="TStoreyInfo" resultMap="TStoreyInfoResult"> <select id="selectTStoreyInfoList" parameterType="TStoreyInfo" resultMap="TStoreyInfoResult">
...@@ -78,6 +79,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" ...@@ -78,6 +79,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="fIp != null">f_ip = #{fIp},</if> <if test="fIp != null">f_ip = #{fIp},</if>
<if test="fStatus != null">f_status = #{fStatus},</if> <if test="fStatus != null">f_status = #{fStatus},</if>
<if test="fPort != null">f_port = #{fPort},</if> <if test="fPort != null">f_port = #{fPort},</if>
<if test="fAgingStartTime != null">f_aging_start_time = #{fAgingStartTime},</if>
<if test="fUpdateTime != null">f_update_time = #{fUpdateTime},</if> <if test="fUpdateTime != null">f_update_time = #{fUpdateTime},</if>
<if test="fCreateTime != null">f_create_time = #{fCreateTime},</if> <if test="fCreateTime != null">f_create_time = #{fCreateTime},</if>
<if test="fAlarmTime != null">f_alarm_time = #{fAlarmTime},</if> <if test="fAlarmTime != null">f_alarm_time = #{fAlarmTime},</if>
......
zhmes-agecal-web/src/views/equipment/index.vue 0 → 100644
View file @ 984865fe
<template>
<div class="app-container">
<el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px">
<el-form-item label="设备编号" prop="fEquipmentCode">
<el-input
v-model="queryParams.fEquipmentCode"
placeholder="请输入设备编号"
clearable
size="small"
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="设备名称" prop="fEquipmentName">
<el-input
v-model="queryParams.fEquipmentName"
placeholder="请输入设备名称"
clearable
size="small"
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="设备类型：1.老化柜、2.标定车、3.机械臂、4.镭雕机、5.AOI检测设备" prop="fEquipmentType">
<el-select v-model="queryParams.fEquipmentType" placeholder="请选择设备类型：1.老化柜、2.标定车、3.机械臂、4.镭雕机、5.AOI检测设备" clearable size="small">
<el-option label="请选择字典生成" value="" />
</el-select>
</el-form-item>
<el-form-item label="厂家" prop="fEquipmentFactory">
<el-input
v-model="queryParams.fEquipmentFactory"
placeholder="请输入厂家"
clearable
size="small"
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="所属部门" prop="fBeyongDepartment">
<el-input
v-model="queryParams.fBeyongDepartment"
placeholder="请输入所属部门"
clearable
size="small"
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="IP地址" prop="fIp">
<el-input
v-model="queryParams.fIp"
placeholder="请输入IP地址"
clearable
size="small"
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="端口号" prop="fPort">
<el-input
v-model="queryParams.fPort"
placeholder="请输入端口号"
clearable
size="small"
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="安装位置" prop="fInstallLocation">
<el-input
v-model="queryParams.fInstallLocation"
placeholder="请输入安装位置"
clearable
size="small"
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="是否巡查点：1.是，2.否" prop="fIsInspect">
<el-input
v-model="queryParams.fIsInspect"
placeholder="请输入是否巡查点：1.是，2.否"
clearable
size="small"
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="负责人" prop="fResponsiblePerson">
<el-input
v-model="queryParams.fResponsiblePerson"
placeholder="请输入负责人"
clearable
size="small"
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="负责人电话" prop="fResponsiblePersonMobile">
<el-input
v-model="queryParams.fResponsiblePersonMobile"
placeholder="请输入负责人电话"
clearable
size="small"
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="创建时间" prop="fCreateTime">
<el-date-picker clearable size="small"
v-model="queryParams.fCreateTime"
type="date"
value-format="yyyy-MM-dd"
placeholder="选择创建时间">
</el-date-picker>
</el-form-item>
<el-form-item label="更新时间" prop="fUpdateTime">
<el-date-picker clearable size="small"
v-model="queryParams.fUpdateTime"
type="date"
value-format="yyyy-MM-dd"
placeholder="选择更新时间">
</el-date-picker>
</el-form-item>
<el-form-item label="状态：0在线，1离线，2故障" prop="fStatus">
<el-select v-model="queryParams.fStatus" placeholder="请选择状态：0在线，1离线，2故障" clearable size="small">
<el-option label="请选择字典生成" value="" />
</el-select>
</el-form-item>
<el-form-item label="报警时间" prop="fAlarmTime">
<el-input
v-model="queryParams.fAlarmTime"
placeholder="请输入报警时间"
clearable
size="small"
@keyup.enter.native="handleQuery"
/>
</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>
<el-row :gutter="10" class="mb8">
<el-col :span="1.5">
<el-button
type="primary"
plain
icon="el-icon-plus"
size="mini"
@click="handleAdd"
v-hasPermi="['equipment:equipment:add']"
>新增</el-button>
</el-col>
<el-col :span="1.5">
<el-button
type="success"
plain
icon="el-icon-edit"
size="mini"
:disabled="single"
@click="handleUpdate"
v-hasPermi="['equipment:equipment:edit']"
>修改</el-button>
</el-col>
<el-col :span="1.5">
<el-button
type="danger"
plain
icon="el-icon-delete"
size="mini"
:disabled="multiple"
@click="handleDelete"
v-hasPermi="['equipment:equipment:remove']"
>删除</el-button>
</el-col>
<el-col :span="1.5">
<el-button
type="warning"
plain
icon="el-icon-download"
size="mini"
:loading="exportLoading"
@click="handleExport"
v-hasPermi="['equipment:equipment:export']"
>导出</el-button>
</el-col>
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
</el-row>
<el-table v-loading="loading" :data="equipmentList" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" align="center" />
<el-table-column label="生产设备id" align="center" prop="fEquipmentId" />
<el-table-column label="设备编号" align="center" prop="fEquipmentCode" />
<el-table-column label="设备名称" align="center" prop="fEquipmentName" />
<el-table-column label="设备类型：1.老化柜、2.标定车、3.机械臂、4.镭雕机、5.AOI检测设备" align="center" prop="fEquipmentType" />
<el-table-column label="厂家" align="center" prop="fEquipmentFactory" />
<el-table-column label="所属部门" align="center" prop="fBeyongDepartment" />
<el-table-column label="IP地址" align="center" prop="fIp" />
<el-table-column label="端口号" align="center" prop="fPort" />
<el-table-column label="安装位置" align="center" prop="fInstallLocation" />
<el-table-column label="是否巡查点：1.是，2.否" align="center" prop="fIsInspect" />
<el-table-column label="负责人" align="center" prop="fResponsiblePerson" />
<el-table-column label="负责人电话" align="center" prop="fResponsiblePersonMobile" />
<el-table-column label="创建时间" align="center" prop="fCreateTime" width="180">
<template slot-scope="scope">
<span>{{ parseTime(scope.row.fCreateTime, '{y}-{m}-{d}') }}</span>
</template>
</el-table-column>
<el-table-column label="更新时间" align="center" prop="fUpdateTime" width="180">
<template slot-scope="scope">
<span>{{ parseTime(scope.row.fUpdateTime, '{y}-{m}-{d}') }}</span>
</template>
</el-table-column>
<el-table-column label="状态：0在线，1离线，2故障" align="center" prop="fStatus" />
<el-table-column label="报警时间" align="center" prop="fAlarmTime" />
<el-table-column label="操作" align="center" class-name="small-padding fixed-width">
<template slot-scope="scope">
<el-button
size="mini"
type="text"
icon="el-icon-edit"
@click="handleUpdate(scope.row)"
v-hasPermi="['equipment:equipment:edit']"
>修改</el-button>
<el-button
size="mini"
type="text"
icon="el-icon-delete"
@click="handleDelete(scope.row)"
v-hasPermi="['equipment:equipment:remove']"
>删除</el-button>
</template>
</el-table-column>
</el-table>
<pagination
v-show="total>0"
:total="total"
:page.sync="queryParams.pageNum"
:limit.sync="queryParams.pageSize"
@pagination="getList"
/>
<!-- 添加或修改生产设备信息对话框 -->
<el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
<el-form ref="form" :model="form" :rules="rules" label-width="80px">
<el-form-item label="设备编号" prop="fEquipmentCode">
<el-input v-model="form.fEquipmentCode" placeholder="请输入设备编号" />
</el-form-item>
<el-form-item label="设备名称" prop="fEquipmentName">
<el-input v-model="form.fEquipmentName" placeholder="请输入设备名称" />
</el-form-item>
<el-form-item label="设备类型：1.老化柜、2.标定车、3.机械臂、4.镭雕机、5.AOI检测设备" prop="fEquipmentType">
<el-select v-model="form.fEquipmentType" placeholder="请选择设备类型：1.老化柜、2.标定车、3.机械臂、4.镭雕机、5.AOI检测设备">
<el-option label="请选择字典生成" value="" />
</el-select>
</el-form-item>
<el-form-item label="厂家" prop="fEquipmentFactory">
<el-input v-model="form.fEquipmentFactory" placeholder="请输入厂家" />
</el-form-item>
<el-form-item label="所属部门" prop="fBeyongDepartment">
<el-input v-model="form.fBeyongDepartment" placeholder="请输入所属部门" />
</el-form-item>
<el-form-item label="IP地址" prop="fIp">
<el-input v-model="form.fIp" placeholder="请输入IP地址" />
</el-form-item>
<el-form-item label="端口号" prop="fPort">
<el-input v-model="form.fPort" placeholder="请输入端口号" />
</el-form-item>
<el-form-item label="安装位置" prop="fInstallLocation">
<el-input v-model="form.fInstallLocation" placeholder="请输入安装位置" />
</el-form-item>
<el-form-item label="是否巡查点：1.是，2.否" prop="fIsInspect">
<el-input v-model="form.fIsInspect" placeholder="请输入是否巡查点：1.是，2.否" />
</el-form-item>
<el-form-item label="负责人" prop="fResponsiblePerson">
<el-input v-model="form.fResponsiblePerson" placeholder="请输入负责人" />
</el-form-item>
<el-form-item label="负责人电话" prop="fResponsiblePersonMobile">
<el-input v-model="form.fResponsiblePersonMobile" placeholder="请输入负责人电话" />
</el-form-item>
<el-form-item label="创建时间" prop="fCreateTime">
<el-date-picker clearable size="small"
v-model="form.fCreateTime"
type="date"
value-format="yyyy-MM-dd"
placeholder="选择创建时间">
</el-date-picker>
</el-form-item>
<el-form-item label="更新时间" prop="fUpdateTime">
<el-date-picker clearable size="small"
v-model="form.fUpdateTime"
type="date"
value-format="yyyy-MM-dd"
placeholder="选择更新时间">
</el-date-picker>
</el-form-item>
<el-form-item label="状态：0在线，1离线，2故障">
<el-radio-group v-model="form.fStatus">
<el-radio label="1">请选择字典生成</el-radio>
</el-radio-group>
</el-form-item>
<el-form-item label="报警时间" prop="fAlarmTime">
<el-input v-model="form.fAlarmTime" placeholder="请输入报警时间" />
</el-form-item>
</el-form>
<div slot="footer" class="dialog-footer">
<el-button type="primary" @click="submitForm">确 定</el-button>
<el-button @click="cancel">取 消</el-button>
</div>
</el-dialog>
</div>
</template>
<script>
import { listEquipment, getEquipment, delEquipment, addEquipment, updateEquipment, exportEquipment } from "@/api/equipment/equipment";
export default {
name: "Equipment",
components: {
},
data() {
return {
// 遮罩层
loading: true,
// 导出遮罩层
exportLoading: false,
// 选中数组
ids: [],
// 非单个禁用
single: true,
// 非多个禁用
multiple: true,
// 显示搜索条件
showSearch: true,
// 总条数
total: 0,
// 生产设备信息表格数据
equipmentList: [],
// 弹出层标题
title: "",
// 是否显示弹出层
open: false,
// 查询参数
queryParams: {
pageNum: 1,
pageSize: 10,
fEquipmentCode: null,
fEquipmentName: null,
fEquipmentType: null,
fEquipmentFactory: null,
fBeyongDepartment: null,
fIp: null,
fPort: null,
fInstallLocation: null,
fIsInspect: null,
fResponsiblePerson: null,
fResponsiblePersonMobile: null,
fCreateTime: null,
fUpdateTime: null,
fStatus: null,
fAlarmTime: null
},
// 表单参数
form: {},
// 表单校验
rules: {
}
};
},
created() {
this.getList();
},
methods: {
/** 查询生产设备信息列表 */
getList() {
this.loading = true;
listEquipment(this.queryParams).then(response => {
this.equipmentList = response.rows;
this.total = response.total;
this.loading = false;
});
},
// 取消按钮
cancel() {
this.open = false;
this.reset();
},
// 表单重置
reset() {
this.form = {
fEquipmentId: null,
fEquipmentCode: null,
fEquipmentName: null,
fEquipmentType: null,
fEquipmentFactory: null,
fBeyongDepartment: null,
fIp: null,
fPort: null,
fInstallLocation: null,
fIsInspect: null,
fResponsiblePerson: null,
fResponsiblePersonMobile: null,
fCreateTime: null,
fUpdateTime: null,
fStatus: "0",
fAlarmTime: null
};
this.resetForm("form");
},
/** 搜索按钮操作 */
handleQuery() {
this.queryParams.pageNum = 1;
this.getList();
},
/** 重置按钮操作 */
resetQuery() {
this.resetForm("queryForm");
this.handleQuery();
},
// 多选框选中数据
handleSelectionChange(selection) {
this.ids = selection.map(item => item.fEquipmentId)
this.single = selection.length!==1
this.multiple = !selection.length
},
/** 新增按钮操作 */
handleAdd() {
this.reset();
this.open = true;
this.title = "添加生产设备信息";
},
/** 修改按钮操作 */
handleUpdate(row) {
this.reset();
const fEquipmentId = row.fEquipmentId || this.ids
getEquipment(fEquipmentId).then(response => {
this.form = response.data;
this.open = true;
this.title = "修改生产设备信息";
});
},
/** 提交按钮 */
submitForm() {
this.$refs["form"].validate(valid => {
if (valid) {
if (this.form.fEquipmentId != null) {
updateEquipment(this.form).then(response => {
this.msgSuccess("修改成功");
this.open = false;
this.getList();
});
} else {
addEquipment(this.form).then(response => {
this.msgSuccess("新增成功");
this.open = false;
this.getList();
});
}
}
});
},
/** 删除按钮操作 */
handleDelete(row) {
const fEquipmentIds = row.fEquipmentId || this.ids;
this.$confirm('是否确认删除生产设备信息编号为"' + fEquipmentIds + '"的数据项?', "警告", {
confirmButtonText: "确定",
cancelButtonText: "取消",
type: "warning"
}).then(function() {
return delEquipment(fEquipmentIds);
}).then(() => {
this.getList();
this.msgSuccess("删除成功");
}).catch(() => {});
},
/** 导出按钮操作 */
handleExport() {
const queryParams = this.queryParams;
this.$confirm('是否确认导出所有生产设备信息数据项?', "警告", {
confirmButtonText: "确定",
cancelButtonText: "取消",
type: "warning"
}).then(() => {
this.exportLoading = true;
return exportEquipment(queryParams);
}).then(response => {
this.download(response.msg);
this.exportLoading = false;
}).catch(() => {});
}
}
};
</script>
zhmes-agecal-web/src/views/equipmentAlarmData/index.vue 0 → 100644
View file @ 984865fe
<template>
<div class="app-container">
<el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px">
<el-form-item label="报警设备编号" prop="fEquipmentCode">
<el-input
v-model="queryParams.fEquipmentCode"
placeholder="请输入报警设备编号"
clearable
size="small"
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="报警类型" prop="fAlarmType">
<el-select v-model="queryParams.fAlarmType" placeholder="请选择报警类型" clearable size="small">
<el-option label="请选择字典生成" value="" />
</el-select>
</el-form-item>
<el-form-item label="报警数据" prop="fAlarmData">
<el-input
v-model="queryParams.fAlarmData"
placeholder="请输入报警数据"
clearable
size="small"
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="创建时间" prop="fCreateTime">
<el-date-picker clearable size="small"
v-model="queryParams.fCreateTime"
type="date"
value-format="yyyy-MM-dd"
placeholder="选择创建时间">
</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>
<el-row :gutter="10" class="mb8">
<el-col :span="1.5">
<el-button
type="primary"
plain
icon="el-icon-plus"
size="mini"
@click="handleAdd"
v-hasPermi="['equipmentAlarmData:equipmentAlarmData:add']"
>新增</el-button>
</el-col>
<el-col :span="1.5">
<el-button
type="success"
plain
icon="el-icon-edit"
size="mini"
:disabled="single"
@click="handleUpdate"
v-hasPermi="['equipmentAlarmData:equipmentAlarmData:edit']"
>修改</el-button>
</el-col>
<el-col :span="1.5">
<el-button
type="danger"
plain
icon="el-icon-delete"
size="mini"
:disabled="multiple"
@click="handleDelete"
v-hasPermi="['equipmentAlarmData:equipmentAlarmData:remove']"
>删除</el-button>
</el-col>
<el-col :span="1.5">
<el-button
type="warning"
plain
icon="el-icon-download"
size="mini"
:loading="exportLoading"
@click="handleExport"
v-hasPermi="['equipmentAlarmData:equipmentAlarmData:export']"
>导出</el-button>
</el-col>
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
</el-row>
<el-table v-loading="loading" :data="equipmentAlarmDataList" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" align="center" />
<el-table-column label="创建时间" align="center" prop="fEquipmentAlarmDataId" />
<el-table-column label="报警设备编号" align="center" prop="fEquipmentCode" />
<el-table-column label="报警类型" align="center" prop="fAlarmType" />
<el-table-column label="报警数据" align="center" prop="fAlarmData" />
<el-table-column label="创建时间" align="center" prop="fCreateTime" width="180">
<template slot-scope="scope">
<span>{{ parseTime(scope.row.fCreateTime, '{y}-{m}-{d}') }}</span>
</template>
</el-table-column>
<el-table-column label="操作" align="center" class-name="small-padding fixed-width">
<template slot-scope="scope">
<el-button
size="mini"
type="text"
icon="el-icon-edit"
@click="handleUpdate(scope.row)"
v-hasPermi="['equipmentAlarmData:equipmentAlarmData:edit']"
>修改</el-button>
<el-button
size="mini"
type="text"
icon="el-icon-delete"
@click="handleDelete(scope.row)"
v-hasPermi="['equipmentAlarmData:equipmentAlarmData:remove']"
>删除</el-button>
</template>
</el-table-column>
</el-table>
<pagination
v-show="total>0"
:total="total"
:page.sync="queryParams.pageNum"
:limit.sync="queryParams.pageSize"
@pagination="getList"
/>
<!-- 添加或修改生产设备报警信息对话框 -->
<el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
<el-form ref="form" :model="form" :rules="rules" label-width="80px">
<el-form-item label="报警设备编号" prop="fEquipmentCode">
<el-input v-model="form.fEquipmentCode" placeholder="请输入报警设备编号" />
</el-form-item>
<el-form-item label="报警类型" prop="fAlarmType">
<el-select v-model="form.fAlarmType" placeholder="请选择报警类型">
<el-option label="请选择字典生成" value="" />
</el-select>
</el-form-item>
<el-form-item label="报警数据" prop="fAlarmData">
<el-input v-model="form.fAlarmData" placeholder="请输入报警数据" />
</el-form-item>
<el-form-item label="创建时间" prop="fCreateTime">
<el-date-picker clearable size="small"
v-model="form.fCreateTime"
type="date"
value-format="yyyy-MM-dd"
placeholder="选择创建时间">
</el-date-picker>
</el-form-item>
</el-form>
<div slot="footer" class="dialog-footer">
<el-button type="primary" @click="submitForm">确 定</el-button>
<el-button @click="cancel">取 消</el-button>
</div>
</el-dialog>
</div>
</template>
<script>
import { listEquipmentAlarmData, getEquipmentAlarmData, delEquipmentAlarmData, addEquipmentAlarmData, updateEquipmentAlarmData, exportEquipmentAlarmData } from "@/api/equipmentAlarmData/equipmentAlarmData";
export default {
name: "EquipmentAlarmData",
components: {
},
data() {
return {
// 遮罩层
loading: true,
// 导出遮罩层
exportLoading: false,
// 选中数组
ids: [],
// 非单个禁用
single: true,
// 非多个禁用
multiple: true,
// 显示搜索条件
showSearch: true,
// 总条数
total: 0,
// 生产设备报警信息表格数据
equipmentAlarmDataList: [],
// 弹出层标题
title: "",
// 是否显示弹出层
open: false,
// 查询参数
queryParams: {
pageNum: 1,
pageSize: 10,
fEquipmentCode: null,
fAlarmType: null,
fAlarmData: null,
fCreateTime: null
},
// 表单参数
form: {},
// 表单校验
rules: {
}
};
},
created() {
this.getList();
},
methods: {
/** 查询生产设备报警信息列表 */
getList() {
this.loading = true;
listEquipmentAlarmData(this.queryParams).then(response => {
this.equipmentAlarmDataList = response.rows;
this.total = response.total;
this.loading = false;
});
},
// 取消按钮
cancel() {
this.open = false;
this.reset();
},
// 表单重置
reset() {
this.form = {
fEquipmentAlarmDataId: null,
fEquipmentCode: null,
fAlarmType: null,
fAlarmData: null,
fCreateTime: null
};
this.resetForm("form");
},
/** 搜索按钮操作 */
handleQuery() {
this.queryParams.pageNum = 1;
this.getList();
},
/** 重置按钮操作 */
resetQuery() {
this.resetForm("queryForm");
this.handleQuery();
},
// 多选框选中数据
handleSelectionChange(selection) {
this.ids = selection.map(item => item.fEquipmentAlarmDataId)
this.single = selection.length!==1
this.multiple = !selection.length
},
/** 新增按钮操作 */
handleAdd() {
this.reset();
this.open = true;
this.title = "添加生产设备报警信息";
},
/** 修改按钮操作 */
handleUpdate(row) {
this.reset();
const fEquipmentAlarmDataId = row.fEquipmentAlarmDataId || this.ids
getEquipmentAlarmData(fEquipmentAlarmDataId).then(response => {
this.form = response.data;
this.open = true;
this.title = "修改生产设备报警信息";
});
},
/** 提交按钮 */
submitForm() {
this.$refs["form"].validate(valid => {
if (valid) {
if (this.form.fEquipmentAlarmDataId != null) {
updateEquipmentAlarmData(this.form).then(response => {
this.msgSuccess("修改成功");
this.open = false;
this.getList();
});
} else {
addEquipmentAlarmData(this.form).then(response => {
this.msgSuccess("新增成功");
this.open = false;
this.getList();
});
}
}
});
},
/** 删除按钮操作 */
handleDelete(row) {
const fEquipmentAlarmDataIds = row.fEquipmentAlarmDataId || this.ids;
this.$confirm('是否确认删除生产设备报警信息编号为"' + fEquipmentAlarmDataIds + '"的数据项?', "警告", {
confirmButtonText: "确定",
cancelButtonText: "取消",
type: "warning"
}).then(function() {
return delEquipmentAlarmData(fEquipmentAlarmDataIds);
}).then(() => {
this.getList();
this.msgSuccess("删除成功");
}).catch(() => {});
},
/** 导出按钮操作 */
handleExport() {
const queryParams = this.queryParams;
this.$confirm('是否确认导出所有生产设备报警信息数据项?', "警告", {
confirmButtonText: "确定",
cancelButtonText: "取消",
type: "warning"
}).then(() => {
this.exportLoading = true;
return exportEquipmentAlarmData(queryParams);
}).then(response => {
this.download(response.msg);
this.exportLoading = false;
}).catch(() => {});
}
}
};
</script>
zhmes-agecal-web/src/views/tray/index.vue 0 → 100644
View file @ 984865fe
<template>
<div class="app-container">
<el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px">
<el-form-item label="托盘编号" prop="fTrayCode">
<el-input
v-model="queryParams.fTrayCode"
placeholder="请输入托盘编号"
clearable
size="small"
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="绑定层编号" prop="fStoreyCode">
<el-input
v-model="queryParams.fStoreyCode"
placeholder="请输入绑定层编号"
clearable
size="small"
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="状态：0.空闲 1.运行" prop="fStatus">
<el-select v-model="queryParams.fStatus" placeholder="请选择状态：0.空闲 1.运行" clearable size="small">
<el-option label="请选择字典生成" value="" />
</el-select>
</el-form-item>
<el-form-item label="绑定时间" prop="fBindingTime">
<el-date-picker clearable size="small"
v-model="queryParams.fBindingTime"
type="date"
value-format="yyyy-MM-dd"
placeholder="选择绑定时间">
</el-date-picker>
</el-form-item>
<el-form-item label="解绑时间" prop="fUnbindingTime">
<el-date-picker clearable size="small"
v-model="queryParams.fUnbindingTime"
type="date"
value-format="yyyy-MM-dd"
placeholder="选择解绑时间">
</el-date-picker>
</el-form-item>
<el-form-item label="创建时间" prop="fCreateTime">
<el-date-picker clearable size="small"
v-model="queryParams.fCreateTime"
type="date"
value-format="yyyy-MM-dd"
placeholder="选择创建时间">
</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>
<el-row :gutter="10" class="mb8">
<el-col :span="1.5">
<el-button
type="primary"
plain
icon="el-icon-plus"
size="mini"
@click="handleAdd"
v-hasPermi="['tray:tray:add']"
>新增</el-button>
</el-col>
<el-col :span="1.5">
<el-button
type="success"
plain
icon="el-icon-edit"
size="mini"
:disabled="single"
@click="handleUpdate"
v-hasPermi="['tray:tray:edit']"
>修改</el-button>
</el-col>
<el-col :span="1.5">
<el-button
type="danger"
plain
icon="el-icon-delete"
size="mini"
:disabled="multiple"
@click="handleDelete"
v-hasPermi="['tray:tray:remove']"
>删除</el-button>
</el-col>
<el-col :span="1.5">
<el-button
type="warning"
plain
icon="el-icon-download"
size="mini"
:loading="exportLoading"
@click="handleExport"
v-hasPermi="['tray:tray:export']"
>导出</el-button>
</el-col>
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
</el-row>
<el-table v-loading="loading" :data="trayList" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" align="center" />
<el-table-column label="托盘id" align="center" prop="fTrayId" />
<el-table-column label="托盘编号" align="center" prop="fTrayCode" />
<el-table-column label="绑定层编号" align="center" prop="fStoreyCode" />
<el-table-column label="状态：0.空闲 1.运行" align="center" prop="fStatus" />
<el-table-column label="绑定时间" align="center" prop="fBindingTime" width="180">
<template slot-scope="scope">
<span>{{ parseTime(scope.row.fBindingTime, '{y}-{m}-{d}') }}</span>
</template>
</el-table-column>
<el-table-column label="解绑时间" align="center" prop="fUnbindingTime" width="180">
<template slot-scope="scope">
<span>{{ parseTime(scope.row.fUnbindingTime, '{y}-{m}-{d}') }}</span>
</template>
</el-table-column>
<el-table-column label="创建时间" align="center" prop="fCreateTime" width="180">
<template slot-scope="scope">
<span>{{ parseTime(scope.row.fCreateTime, '{y}-{m}-{d}') }}</span>
</template>
</el-table-column>
<el-table-column label="操作" align="center" class-name="small-padding fixed-width">
<template slot-scope="scope">
<el-button
size="mini"
type="text"
icon="el-icon-edit"
@click="handleUpdate(scope.row)"
v-hasPermi="['tray:tray:edit']"
>修改</el-button>
<el-button
size="mini"
type="text"
icon="el-icon-delete"
@click="handleDelete(scope.row)"
v-hasPermi="['tray:tray:remove']"
>删除</el-button>
</template>
</el-table-column>
</el-table>
<pagination
v-show="total>0"
:total="total"
:page.sync="queryParams.pageNum"
:limit.sync="queryParams.pageSize"
@pagination="getList"
/>
<!-- 添加或修改托盘信息对话框 -->
<el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
<el-form ref="form" :model="form" :rules="rules" label-width="80px">
<el-form-item label="托盘编号" prop="fTrayCode">
<el-input v-model="form.fTrayCode" placeholder="请输入托盘编号" />
</el-form-item>
<el-form-item label="绑定层编号" prop="fStoreyCode">
<el-input v-model="form.fStoreyCode" placeholder="请输入绑定层编号" />
</el-form-item>
<el-form-item label="状态：0.空闲 1.运行">
<el-radio-group v-model="form.fStatus">
<el-radio label="1">请选择字典生成</el-radio>
</el-radio-group>
</el-form-item>
<el-form-item label="绑定时间" prop="fBindingTime">
<el-date-picker clearable size="small"
v-model="form.fBindingTime"
type="date"
value-format="yyyy-MM-dd"
placeholder="选择绑定时间">
</el-date-picker>
</el-form-item>
<el-form-item label="解绑时间" prop="fUnbindingTime">
<el-date-picker clearable size="small"
v-model="form.fUnbindingTime"
type="date"
value-format="yyyy-MM-dd"
placeholder="选择解绑时间">
</el-date-picker>
</el-form-item>
<el-form-item label="创建时间" prop="fCreateTime">
<el-date-picker clearable size="small"
v-model="form.fCreateTime"
type="date"
value-format="yyyy-MM-dd"
placeholder="选择创建时间">
</el-date-picker>
</el-form-item>
</el-form>
<div slot="footer" class="dialog-footer">
<el-button type="primary" @click="submitForm">确 定</el-button>
<el-button @click="cancel">取 消</el-button>
</div>
</el-dialog>
</div>
</template>
<script>
import { listTray, getTray, delTray, addTray, updateTray, exportTray } from "@/api/tray/tray";
export default {
name: "Tray",
components: {
},
data() {
return {
// 遮罩层
loading: true,
// 导出遮罩层
exportLoading: false,
// 选中数组
ids: [],
// 非单个禁用
single: true,
// 非多个禁用
multiple: true,
// 显示搜索条件
showSearch: true,
// 总条数
total: 0,
// 托盘信息表格数据
trayList: [],
// 弹出层标题
title: "",
// 是否显示弹出层
open: false,
// 查询参数
queryParams: {
pageNum: 1,
pageSize: 10,
fTrayCode: null,
fStoreyCode: null,
fStatus: null,
fBindingTime: null,
fUnbindingTime: null,
fCreateTime: null
},
// 表单参数
form: {},
// 表单校验
rules: {
}
};
},
created() {
this.getList();
},
methods: {
/** 查询托盘信息列表 */
getList() {
this.loading = true;
listTray(this.queryParams).then(response => {
this.trayList = response.rows;
this.total = response.total;
this.loading = false;
});
},
// 取消按钮
cancel() {
this.open = false;
this.reset();
},
// 表单重置
reset() {
this.form = {
fTrayId: null,
fTrayCode: null,
fStoreyCode: null,
fStatus: "0",
fBindingTime: null,
fUnbindingTime: null,
fCreateTime: null
};
this.resetForm("form");
},
/** 搜索按钮操作 */
handleQuery() {
this.queryParams.pageNum = 1;
this.getList();
},
/** 重置按钮操作 */
resetQuery() {
this.resetForm("queryForm");
this.handleQuery();
},
// 多选框选中数据
handleSelectionChange(selection) {
this.ids = selection.map(item => item.fTrayId)
this.single = selection.length!==1
this.multiple = !selection.length
},
/** 新增按钮操作 */
handleAdd() {
this.reset();
this.open = true;
this.title = "添加托盘信息";
},
/** 修改按钮操作 */
handleUpdate(row) {
this.reset();
const fTrayId = row.fTrayId || this.ids
getTray(fTrayId).then(response => {
this.form = response.data;
this.open = true;
this.title = "修改托盘信息";
});
},
/** 提交按钮 */
submitForm() {
this.$refs["form"].validate(valid => {
if (valid) {
if (this.form.fTrayId != null) {
updateTray(this.form).then(response => {
this.msgSuccess("修改成功");
this.open = false;
this.getList();
});
} else {
addTray(this.form).then(response => {
this.msgSuccess("新增成功");
this.open = false;
this.getList();
});
}
}
});
},
/** 删除按钮操作 */
handleDelete(row) {
const fTrayIds = row.fTrayId || this.ids;
this.$confirm('是否确认删除托盘信息编号为"' + fTrayIds + '"的数据项?', "警告", {
confirmButtonText: "确定",
cancelButtonText: "取消",
type: "warning"
}).then(function() {
return delTray(fTrayIds);
}).then(() => {
this.getList();
this.msgSuccess("删除成功");
}).catch(() => {});
},
/** 导出按钮操作 */
handleExport() {
const queryParams = this.queryParams;
this.$confirm('是否确认导出所有托盘信息数据项?', "警告", {
confirmButtonText: "确定",
cancelButtonText: "取消",
type: "warning"
}).then(() => {
this.exportLoading = true;
return exportTray(queryParams);
}).then(response => {
this.download(response.msg);
this.exportLoading = false;
}).catch(() => {});
}
}
};
</script>
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