Skip to content

Z
zhengyuan-danger-chemistry-manage
Commit 190d6650 authored by zhangjianqian's avatar zhangjianqian
Browse files
Options

Merge remote-tracking branch 'origin/master'

parents 573b966e 21a32346
Hide whitespace changes
Inline Side-by-side
Showing with 651 additions and 278 deletions
danger-manage-admin/src/main/java/com/zehong/web/controller/system/TNfcSettingController.java
View file @ 190d6650
package com.zehong.web.controller.system; package com.zehong.web.controller.system;
import java.util.List; import java.util.List;
import com.zehong.system.domain.TNfcRecord;
import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.GetMapping;
...@@ -44,6 +46,18 @@ public class TNfcSettingController extends BaseController ...@@ -44,6 +46,18 @@ public class TNfcSettingController extends BaseController
return getDataTable(list); return getDataTable(list);
} }
/**
* 巡检打卡查询列表
* @param tNfcSetting
* @return
*/
@GetMapping("/punchClockList")
public TableDataInfo punchClockList(TNfcSetting tNfcSetting){
startPage();
List<TNfcRecord> list = tNfcSettingService.punchClockList(tNfcSetting);
return getDataTable(list);
}
/** /**
* 导出巡检列表 * 导出巡检列表
*/ */
...@@ -83,6 +97,7 @@ public class TNfcSettingController extends BaseController ...@@ -83,6 +97,7 @@ public class TNfcSettingController extends BaseController
@PostMapping @PostMapping
public AjaxResult add(@RequestBody TNfcSetting tNfcSetting) public AjaxResult add(@RequestBody TNfcSetting tNfcSetting)
{ {
System.out.println(tNfcSetting);
return toAjax(tNfcSettingService.insertTNfcSetting(tNfcSetting)); return toAjax(tNfcSettingService.insertTNfcSetting(tNfcSetting));
} }
......
danger-manage-system/src/main/java/com/zehong/system/domain/TNfcRecord.java
View file @ 190d6650
package com.zehong.system.domain; package com.zehong.system.domain;
import com.fasterxml.jackson.annotation.JsonFormat;
import org.apache.commons.lang3.builder.ToStringBuilder;
import org.apache.commons.lang3.builder.ToStringStyle;
import com.zehong.common.annotation.Excel; import com.zehong.common.annotation.Excel;
import com.zehong.common.core.domain.BaseEntity; import com.zehong.common.core.domain.BaseEntity;
import java.util.Date;
/** /**
* nfc巡检记录id对象 t_nfc_record * nfc巡检记录id对象 t_nfc_record
* *
* @author zehong * @author zehong
* @date 2022-10-18 * @date 2022-10-18
*/ */
public class TNfcRecord extends BaseEntity public class TNfcRecord extends BaseEntity {
{
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
/** 巡检记录 */ /**
* 巡检记录
*/
private Long recordId; private Long recordId;
/** nfc_id */ /**
* nfc_id
*/
@Excel(name = "nfc_id") @Excel(name = "nfc_id")
private Long nfcId; private Long nfcId;
/** 是否正常 0否 1是 */ /**
* 是否正常 0否 1是
*/
@Excel(name = "是否正常 0否 1是") @Excel(name = "是否正常 0否 1是")
private Integer isNormal; private Integer isNormal;
/** 图片地址 */ /**
* 图片地址
*/
@Excel(name = "图片地址") @Excel(name = "图片地址")
private String picture; private String picture;
/** 备注 */ /**
* 备注
*/
@Excel(name = "备注") @Excel(name = "备注")
private String remarks; private String remarks;
/** 上报人 */ /**上报时间*/
@JsonFormat(pattern = "yyyy-MM-dd hh:mm:ss")
private Date createTime;
/**
* 上报人姓名
*/
@Excel(name = "上报人") @Excel(name = "上报人")
private Long createUser; private Long createUser;
private String userName; /**巡检地点*/
@Excel(name = "巡检地点")
private String patrolAddress; private String patrolAddress;
/** 巡检内容 */ /**巡检内容*/
@Excel(name = "巡检内容") private String patrolComent;
private String patrolComent;
/** 巡检频次 */ /**巡检频次*/
@Excel(name = "巡检频次")
private String patrolFrequency; private String patrolFrequency;
/** 巡检人*/
private String nickName;
private String userName;
private String startTime; private String startTime;
private String endTime; private String endTime;
public String getUserName() { /**巡检区域*/
return userName; private String dictLabel;
}
public void setUserName(String userName) { public String getDictLabel() {
this.userName = userName; return dictLabel;
} }
public String getStartTime() { public void setDictLabel(String dictLabel) {
return startTime; this.dictLabel = dictLabel;
} }
public void setStartTime(String startTime) { @Override
this.startTime = startTime; public Date getCreateTime() {
} return createTime;
public String getEndTime() {
return endTime;
} }
public void setEndTime(String endTime) { @Override
this.endTime = endTime; public void setCreateTime(Date createTime) {
this.createTime = createTime;
} }
public String getPatrolAddress() { public String getPatrolAddress() {
...@@ -103,71 +115,110 @@ public class TNfcRecord extends BaseEntity ...@@ -103,71 +115,110 @@ public class TNfcRecord extends BaseEntity
this.patrolFrequency = patrolFrequency; this.patrolFrequency = patrolFrequency;
} }
public void setRecordId(Long recordId) public String getNickName() {
{ return nickName;
this.recordId = recordId; }
public void setNickName(String nickName) {
this.nickName = nickName;
}
public static long getSerialVersionUID() {
return serialVersionUID;
} }
public Long getRecordId() public Long getRecordId() {
{
return recordId; return recordId;
} }
public void setNfcId(Long nfcId)
{ public void setRecordId(Long recordId) {
this.nfcId = nfcId; this.recordId = recordId;
} }
public Long getNfcId() public Long getNfcId() {
{
return nfcId; return nfcId;
} }
public void setIsNormal(Integer isNormal)
{ public void setNfcId(Long nfcId) {
this.isNormal = isNormal; this.nfcId = nfcId;
} }
public Integer getIsNormal() public Integer getIsNormal() {
{
return isNormal; return isNormal;
} }
public void setPicture(String picture)
{ public void setIsNormal(Integer isNormal) {
this.picture = picture; this.isNormal = isNormal;
} }
public String getPicture() public String getPicture() {
{
return picture; return picture;
} }
public void setRemarks(String remarks)
{ public void setPicture(String picture) {
this.remarks = remarks; this.picture = picture;
} }
public String getRemarks() public String getRemarks() {
{
return remarks; return remarks;
} }
public void setCreateUser(Long createUser)
{ public void setRemarks(String remarks) {
this.createUser = createUser; this.remarks = remarks;
} }
public Long getCreateUser() public Long getCreateUser() {
{
return createUser; return createUser;
} }
public void setCreateUser(Long createUser) {
this.createUser = createUser;
}
public String getUserName() {
return userName;
}
public void setUserName(String userName) {
this.userName = userName;
}
public String getStartTime() {
return startTime;
}
public void setStartTime(String startTime) {
this.startTime = startTime;
}
public String getEndTime() {
return endTime;
}
public void setEndTime(String endTime) {
this.endTime = endTime;
}
@Override @Override
public String toString() { public String toString() {
return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) return "TNfcRecord{" +
.append("recordId", getRecordId()) "recordId=" + recordId +
.append("nfcId", getNfcId()) ", nfcId=" + nfcId +
.append("isNormal", getIsNormal()) ", isNormal=" + isNormal +
.append("picture", getPicture()) ", picture='" + picture + '\'' +
.append("remarks", getRemarks()) ", remarks='" + remarks + '\'' +
.append("createTime", getCreateTime()) ", createTime=" + createTime +
.append("createUser", getCreateUser()) ", createUser=" + createUser +
.toString(); ", patrolAddress='" + patrolAddress + '\'' +
", patrolComent='" + patrolComent + '\'' +
", patrolFrequency='" + patrolFrequency + '\'' +
", nickName='" + nickName + '\'' +
", userName='" + userName + '\'' +
", startTime='" + startTime + '\'' +
", endTime='" + endTime + '\'' +
", dictLabel='" + dictLabel + '\'' +
'}';
} }
} }
danger-manage-system/src/main/java/com/zehong/system/domain/TNfcSetting.java
View file @ 190d6650
...@@ -42,10 +42,24 @@ public class TNfcSetting extends BaseEntity ...@@ -42,10 +42,24 @@ public class TNfcSetting extends BaseEntity
private Integer isDel; private Integer isDel;
/** /**
* 区域 0氨合成 1罐区 * 区域 编号
*/ */
private String region; private String region;
/**
* 巡检区域
*/
private String nickName;
public String getNickName() {
return nickName;
}
public void setNickName(String nickName) {
this.nickName = nickName;
}
public static long getSerialVersionUID() { public static long getSerialVersionUID() {
return serialVersionUID; return serialVersionUID;
...@@ -134,6 +148,7 @@ public class TNfcSetting extends BaseEntity ...@@ -134,6 +148,7 @@ public class TNfcSetting extends BaseEntity
", nfcNum='" + nfcNum + '\'' + ", nfcNum='" + nfcNum + '\'' +
", isDel=" + isDel + ", isDel=" + isDel +
", region='" + region + '\'' + ", region='" + region + '\'' +
", nickName='" + nickName + '\'' +
'}'; '}';
} }
} }
danger-manage-system/src/main/java/com/zehong/system/mapper/TNfcSettingMapper.java
View file @ 190d6650
package com.zehong.system.mapper; package com.zehong.system.mapper;
import java.util.List; import java.util.List;
import com.zehong.system.domain.TNfcRecord;
import com.zehong.system.domain.TNfcSetting; import com.zehong.system.domain.TNfcSetting;
/** /**
* settingMapper接口 * settingMapper接口
* *
* @author zehong * @author zehong
* @date 2022-10-17 * @date 2022-10-17
*/ */
public interface TNfcSettingMapper public interface TNfcSettingMapper
{ {
/** /**
* 查询setting * 查询setting
* *
* @param nfcId settingID * @param nfcId settingID
* @return setting * @return setting
*/ */
...@@ -27,7 +29,7 @@ public interface TNfcSettingMapper ...@@ -27,7 +29,7 @@ public interface TNfcSettingMapper
/** /**
* 查询setting列表 * 查询setting列表
* *
* @param tNfcSetting setting * @param tNfcSetting setting
* @return setting集合 * @return setting集合
*/ */
...@@ -35,7 +37,7 @@ public interface TNfcSettingMapper ...@@ -35,7 +37,7 @@ public interface TNfcSettingMapper
/** /**
* 新增setting * 新增setting
* *
* @param tNfcSetting setting * @param tNfcSetting setting
* @return 结果 * @return 结果
*/ */
...@@ -43,7 +45,7 @@ public interface TNfcSettingMapper ...@@ -43,7 +45,7 @@ public interface TNfcSettingMapper
/** /**
* 修改setting * 修改setting
* *
* @param tNfcSetting setting * @param tNfcSetting setting
* @return 结果 * @return 结果
*/ */
...@@ -51,7 +53,7 @@ public interface TNfcSettingMapper ...@@ -51,7 +53,7 @@ public interface TNfcSettingMapper
/** /**
* 删除setting * 删除setting
* *
* @param nfcId settingID * @param nfcId settingID
* @return 结果 * @return 结果
*/ */
...@@ -59,9 +61,16 @@ public interface TNfcSettingMapper ...@@ -59,9 +61,16 @@ public interface TNfcSettingMapper
/** /**
* 批量删除setting * 批量删除setting
* *
* @param nfcIds 需要删除的数据ID * @param nfcIds 需要删除的数据ID
* @return 结果 * @return 结果
*/ */
public int deleteTNfcSettingByIds(Long[] nfcIds); public int deleteTNfcSettingByIds(Long[] nfcIds);
/**
* 巡检打卡查询列表
* @param tNfcSetting
* @return
*/
List<TNfcRecord> punchClockList(TNfcSetting tNfcSetting);
} }
danger-manage-system/src/main/java/com/zehong/system/service/ITNfcSettingService.java
View file @ 190d6650
package com.zehong.system.service; package com.zehong.system.service;
import java.util.List; import java.util.List;
import com.zehong.system.domain.TNfcRecord;
import com.zehong.system.domain.TNfcSetting; import com.zehong.system.domain.TNfcSetting;
/** /**
* settingService接口 * settingService接口
* *
* @author zehong * @author zehong
* @date 2022-10-17 * @date 2022-10-17
*/ */
public interface ITNfcSettingService public interface ITNfcSettingService
{ {
/** /**
* 查询setting * 查询setting
* *
* @param nfcId settingID * @param nfcId settingID
* @return setting * @return setting
*/ */
...@@ -27,7 +29,7 @@ public interface ITNfcSettingService ...@@ -27,7 +29,7 @@ public interface ITNfcSettingService
public TNfcSetting getInfoByNfcNum(String nfcNum); public TNfcSetting getInfoByNfcNum(String nfcNum);
/** /**
* 查询setting列表 * 查询setting列表
* *
* @param tNfcSetting setting * @param tNfcSetting setting
* @return setting集合 * @return setting集合
*/ */
...@@ -35,7 +37,7 @@ public interface ITNfcSettingService ...@@ -35,7 +37,7 @@ public interface ITNfcSettingService
/** /**
* 新增setting * 新增setting
* *
* @param tNfcSetting setting * @param tNfcSetting setting
* @return 结果 * @return 结果
*/ */
...@@ -43,7 +45,7 @@ public interface ITNfcSettingService ...@@ -43,7 +45,7 @@ public interface ITNfcSettingService
/** /**
* 修改setting * 修改setting
* *
* @param tNfcSetting setting * @param tNfcSetting setting
* @return 结果 * @return 结果
*/ */
...@@ -51,7 +53,7 @@ public interface ITNfcSettingService ...@@ -51,7 +53,7 @@ public interface ITNfcSettingService
/** /**
* 批量删除setting * 批量删除setting
* *
* @param nfcIds 需要删除的settingID * @param nfcIds 需要删除的settingID
* @return 结果 * @return 结果
*/ */
...@@ -59,9 +61,16 @@ public interface ITNfcSettingService ...@@ -59,9 +61,16 @@ public interface ITNfcSettingService
/** /**
* 删除setting信息 * 删除setting信息
* *
* @param nfcId settingID * @param nfcId settingID
* @return 结果 * @return 结果
*/ */
public int deleteTNfcSettingById(Long nfcId); public int deleteTNfcSettingById(Long nfcId);
/**
* 巡检打卡查询列表
* @param tNfcSetting
* @return
*/
List<TNfcRecord> punchClockList(TNfcSetting tNfcSetting);
} }
danger-manage-system/src/main/java/com/zehong/system/service/impl/TNfcSettingServiceImpl.java
View file @ 190d6650
...@@ -2,6 +2,7 @@ package com.zehong.system.service.impl; ...@@ -2,6 +2,7 @@ package com.zehong.system.service.impl;
import java.util.List; import java.util.List;
import com.zehong.common.utils.DateUtils; import com.zehong.common.utils.DateUtils;
import com.zehong.system.domain.TNfcRecord;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import com.zehong.system.mapper.TNfcSettingMapper; import com.zehong.system.mapper.TNfcSettingMapper;
...@@ -11,19 +12,19 @@ import org.springframework.transaction.annotation.Transactional; ...@@ -11,19 +12,19 @@ import org.springframework.transaction.annotation.Transactional;
/** /**
* settingService业务层处理 * settingService业务层处理
* *
* @author zehong * @author zehong
* @date 2022-10-17 * @date 2022-10-17
*/ */
@Service @Service
public class TNfcSettingServiceImpl implements ITNfcSettingService public class TNfcSettingServiceImpl implements ITNfcSettingService
{ {
@Autowired @Autowired
private TNfcSettingMapper tNfcSettingMapper; private TNfcSettingMapper tNfcSettingMapper;
/** /**
* 查询setting * 查询setting
* *
* @param nfcId settingID * @param nfcId settingID
* @return setting * @return setting
*/ */
...@@ -46,7 +47,7 @@ public class TNfcSettingServiceImpl implements ITNfcSettingService ...@@ -46,7 +47,7 @@ public class TNfcSettingServiceImpl implements ITNfcSettingService
/** /**
* 查询setting列表 * 查询setting列表
* *
* @param tNfcSetting setting * @param tNfcSetting setting
* @return setting * @return setting
*/ */
...@@ -58,7 +59,7 @@ public class TNfcSettingServiceImpl implements ITNfcSettingService ...@@ -58,7 +59,7 @@ public class TNfcSettingServiceImpl implements ITNfcSettingService
/** /**
* 新增setting * 新增setting
* *
* @param tNfcSetting setting * @param tNfcSetting setting
* @return 结果 * @return 结果
*/ */
...@@ -71,7 +72,7 @@ public class TNfcSettingServiceImpl implements ITNfcSettingService ...@@ -71,7 +72,7 @@ public class TNfcSettingServiceImpl implements ITNfcSettingService
/** /**
* 修改setting * 修改setting
* *
* @param tNfcSetting setting * @param tNfcSetting setting
* @return 结果 * @return 结果
*/ */
...@@ -90,7 +91,7 @@ public class TNfcSettingServiceImpl implements ITNfcSettingService ...@@ -90,7 +91,7 @@ public class TNfcSettingServiceImpl implements ITNfcSettingService
/** /**
* 批量删除setting * 批量删除setting
* *
* @param nfcIds 需要删除的settingID * @param nfcIds 需要删除的settingID
* @return 结果 * @return 结果
*/ */
...@@ -102,7 +103,7 @@ public class TNfcSettingServiceImpl implements ITNfcSettingService ...@@ -102,7 +103,7 @@ public class TNfcSettingServiceImpl implements ITNfcSettingService
/** /**
* 删除setting信息 * 删除setting信息
* *
* @param nfcId settingID * @param nfcId settingID
* @return 结果 * @return 结果
*/ */
...@@ -111,4 +112,14 @@ public class TNfcSettingServiceImpl implements ITNfcSettingService ...@@ -111,4 +112,14 @@ public class TNfcSettingServiceImpl implements ITNfcSettingService
{ {
return tNfcSettingMapper.deleteTNfcSettingById(nfcId); return tNfcSettingMapper.deleteTNfcSettingById(nfcId);
} }
/**
* 巡检打卡查询列表
* @param tNfcSetting
* @return
*/
@Override
public List<TNfcRecord> punchClockList(TNfcSetting tNfcSetting) {
return tNfcSettingMapper.punchClockList(tNfcSetting);
}
} }
danger-manage-system/src/main/resources/mapper/system/TNfcSettingMapper.xml
View file @ 190d6650
...@@ -13,18 +13,20 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" ...@@ -13,18 +13,20 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<result property="nfcNum" column="nfc_num" /> <result property="nfcNum" column="nfc_num" />
<result property="createTime" column="create_time" /> <result property="createTime" column="create_time" />
<result property="isDel" column="is_del" /> <result property="isDel" column="is_del" />
<result property="region" column="region" />
</resultMap> </resultMap>
<sql id="selectTNfcSettingVo"> <sql id="selectTNfcSettingVo">
select nfc_id, patrol_sort, patrol_address, patrol_coment, patrol_frequency, nfc_num, create_time, is_del from t_nfc_setting select nfc_id, patrol_sort, patrol_address, patrol_coment, patrol_frequency, nfc_num, create_time,region, is_del from t_nfc_setting
</sql> </sql>
<select id="selectTNfcSettingList" parameterType="TNfcSetting" resultMap="TNfcSettingResult"> <select id="selectTNfcSettingList" parameterType="TNfcSetting" resultMap="TNfcSettingResult">
<include refid="selectTNfcSettingVo"/> select a.*,b.dict_label as nickName from t_nfc_setting a
left join sys_dict_data b on a.region=b.dict_value
<where> <where>
is_del='0' a.is_del='0' and b.dict_type='t_nfc_region'
<if test="region != null"> and region = #{region}</if> <if test="region != null and region != ''"> and region = #{region}</if>
<if test="patrolAddress != null and patrolAddress != ''"> and patrol_address like concat('%',#{patrolAddress},'%') </if> <if test="patrolAddress != null and patrolAddress != ''"> and patrol_address = #{patrolAddress}</if>
<if test="nfcNum != null and nfcNum != ''"> and nfc_num = #{nfcNum}</if> <if test="nfcNum != null and nfcNum != ''"> and nfc_num = #{nfcNum}</if>
</where> </where>
order by patrol_sort order by patrol_sort
...@@ -87,4 +89,25 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" ...@@ -87,4 +89,25 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
#{nfcId} #{nfcId}
</foreach> </foreach>
</update> </update>
<!--巡检打卡查询列表-->
<select id="punchClockList" resultType="com.zehong.system.domain.TNfcRecord">
select a.is_normal as isNormal,a.remarks as remarks ,a.create_time as createTime,
b.patrol_address as patrolAddress,b.patrol_coment as patrolComent,b.patrol_frequency as patrolFrequency,
c.nick_name as nickName,
d.dict_label as dictLabel
from t_nfc_record a left join t_nfc_setting b on a.nfc_id=b.nfc_id
left join sys_user c on a.create_user=c.user_id
left join sys_dict_data d on b.region=d.dict_value
<where>
b.is_del='0' and d.dict_type='t_nfc_region'
<if test="patrolAddress != null and patrolName != ''">
and b.patrol_address like concat('%', #{patrolAddress}, '%')
</if>
<if test="region != null and region != ''">
and b.region=#{region}
</if>
</where>
group by a.create_time desc
</select>
</mapper> </mapper>
danger-manage-web/src/api/system/statistics.js 0 → 100644
View file @ 190d6650
import request from '@/utils/request'
// 查询setting列表
export function listSetting(query) {
return request({
url: '/system/inspection/punchClockList',
method: 'get',
params: query
})
}
// 查询setting详细
export function getSetting(nfcId) {
return request({
url: '/system/inspection/' + nfcId,
method: 'get'
})
}
// 新增setting
export function addSetting(data) {
return request({
url: '/system/inspection',
method: 'post',
data: data
})
}
// 修改setting
export function updateSetting(data) {
return request({
url: '/system/inspection',
method: 'put',
data: data
})
}
// 删除setting
export function delSetting(nfcId) {
return request({
url: '/system/inspection/' + nfcId,
method: 'delete'
})
}
// 导出setting
export function exportSetting(query) {
return request({
url: '/system/inspection/export',
method: 'get',
params: query
})
}
danger-manage-web/src/views/system/statistics/index.vue 0 → 100644
View file @ 190d6650
<template>
<div class="app-container">
<el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px">
<el-form-item label="巡检地点" prop="patrolAddress">
<el-input
v-model="queryParams.patrolAddress"
placeholder="请输入巡检地点"
clearable
size="small"
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="巡检区域" prop="workType">
<el-select v-model="queryParams.region" placeholder="请选择区域" clearable size="small">
<el-option
v-for="dict in workTypeOptions"
:key="dict.dictValue"
:label="dict.dictLabel"
:value="dict.dictValue"
/>
</el-select>
</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="['system:setting: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="['system:setting: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="['system:setting: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="['system:setting:export']"-->
<!-- >导出</el-button>-->
<!-- </el-col>-->
<!-- <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>-->
<!-- </el-row>-->
<el-table v-loading="loading" :data="settingList" @selection-change="handleSelectionChange">
<el-table-column width="250" label="巡检地点" align="center" prop="patrolAddress" />
<el-table-column width="250" label="巡检区域" align="center" prop="dictLabel" />
<el-table-column width="650" label="巡检内容" align="center" prop="patrolComent" >
<span slot-scope="scope" v-if="scope.row.patrolComent">{{scope.row.patrolComent}}</span>
<span v-else>-</span>
</el-table-column>
<el-table-column label="巡检频次" align="center" prop="patrolFrequency" >
<span slot-scope="scope" v-if="scope.row.patrolFrequency">{{scope.row.patrolFrequency}}</span>
<span v-else>-</span>
</el-table-column>
<el-table-column width="150" label="上报人" align="center" prop="nickName" />
<el-table-column width="200" label="是否正常" align="center" prop="isNormal">
<span slot-scope="scope" style="color: red" v-if="scope.row.isNormal==0">异常</span>
<span slot-scope="scope" v-else-if="scope.row.isNormal==1">正常</span>
</el-table-column>
<el-table-column label="上报时间" align="center" prop="createTime" />
<!-- <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="['system:setting:edit']"-->
<!-- >修改</el-button>-->
<!-- <el-button-->
<!-- size="mini"-->
<!-- type="text"-->
<!-- icon="el-icon-delete"-->
<!-- @click="handleDelete(scope.row)"-->
<!-- v-hasPermi="['system:setting: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"
/>
<!-- 添加或修改setting对话框 -->
<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="patrolSort">
<el-input v-model="form.patrolSort" placeholder="请输入排序" />
</el-form-item>
<el-form-item label="巡检地点" prop="patrolAddress">
<el-input v-model="form.patrolAddress" placeholder="请输入巡检地点" />
</el-form-item>
<el-form-item label="巡检频次" prop="patrolFrequency">
<el-input v-model="form.patrolFrequency" placeholder="请输入巡检频次" />
</el-form-item>
<el-form-item label="nfc编号" prop="nfcNum">
<el-input v-model="form.nfcNum" placeholder="请输入nfc编号" />
</el-form-item>
<el-form-item label="巡检内容" prop="patrolComent">
<el-input v-model="form.patrolComent" type="textarea" 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 { listSetting, getSetting, delSetting, addSetting, updateSetting, exportSetting } from "@/api/system/statistics.js";
export default {
name: "Setting",
components: {
},
data() {
return {
region:null,
activeName: '0',
// 遮罩层
loading: true,
// 导出遮罩层
exportLoading: false,
// 选中数组
ids: [],
// 非单个禁用
single: true,
// 非多个禁用
multiple: true,
// 显示搜索条件
showSearch: true,
// 总条数
total: 0,
// setting表格数据
settingList: [],
//查询下拉框数据
workTypeOptions: [],
// 弹出层标题
title: "",
// 是否显示弹出层
open: false,
// 查询参数
queryParams: {
pageNum: 1,
pageSize: 10,
patrolAddress: null,
nfcNum: null,
region:null,
},
// 表单参数
form: {},
// 表单校验
rules: {
patrolAddress: [
{ required: true, message: "巡检地点不能为空", trigger: "blur" }
],
patrolSort: [
{ required: true, message: "排序不能为空", trigger: "blur" }
],
}
};
},
created() {
this.getList();
this.getDicts("t_nfc_region").then(response => {
this.workTypeOptions = response.data;
});
},
methods: {
/** 查询setting列表 */
getList() {
this.loading = true;
listSetting(this.queryParams).then(response => {
this.settingList = response.rows;
this.total = response.total;
this.loading = false;
});
},
// 取消按钮
cancel() {
this.open = false;
this.reset();
},
// 表单重置
reset() {
this.form = {
nfcId: null,
patrolSort: null,
patrolAddress: null,
patrolComent: null,
patrolFrequency: null,
nfcNum: null,
createTime: null,
isDel: null,
region: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.nfcId)
this.single = selection.length!==1
this.multiple = !selection.length
},
/** 新增按钮操作 */
handleAdd() {
this.reset();
this.open = true;
this.title = "化工车间巡检";
},
/** 修改按钮操作 */
handleUpdate(row) {
this.reset();
const nfcId = row.nfcId || this.ids
getSetting(nfcId).then(response => {
this.form = response.data;
this.open = true;
this.title = "修改化工车间巡检信息";
});
},
/** 提交按钮 */
submitForm() {
this.$refs["form"].validate(valid => {
if (valid) {
if (this.form.nfcId != null) {
updateSetting(this.form).then(response => {
this.msgSuccess("修改成功");
this.open = false;
this.getList();
});
} else {
this.form.region= this.queryParams.region;
addSetting(this.form).then(response => {
this.msgSuccess("新增成功");
this.open = false;
this.getList();
});
}
}
});
},
/** 删除按钮操作 */
handleDelete(row) {
const nfcIds = row.nfcId || this.ids;
const patrolAddress = row.patrolAddress;
this.$confirm('是否确认删除巡检地点为"' + patrolAddress + '"的数据项?', "警告", {
confirmButtonText: "确定",
cancelButtonText: "取消",
type: "warning"
}).then(function() {
return delSetting(nfcIds);
}).then(() => {
this.getList();
this.msgSuccess("删除成功");
}).catch(() => {});
},
/** 导出按钮操作 */
handleExport() {
const queryParams = this.queryParams;
this.$confirm('是否确认导出所有巡检数据项?', "警告", {
confirmButtonText: "确定",
cancelButtonText: "取消",
type: "warning"
}).then(() => {
this.exportLoading = true;
return exportSetting(queryParams);
}).then(response => {
this.download(response.msg);
this.exportLoading = false;
}).catch(() => {});
}
}
};
</script>
danger-manage-web/src/views/system/tNfcSetting/index.vue
View file @ 190d6650
<template> <template>
<el-tabs v-model="activeName" type="card" @tab-click="handleClick">
<el-tab-pane label="氨合成" name="0">
<div class="app-container"> <div class="app-container">
<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="68px">
<el-form-item label="巡检地点" prop="patrolAddress"> <el-form-item label="巡检地点" prop="patrolAddress">
...@@ -21,6 +19,16 @@ ...@@ -21,6 +19,16 @@
@keyup.enter.native="handleQuery" @keyup.enter.native="handleQuery"
/> />
</el-form-item> </el-form-item>
<el-form-item label="巡检区域" >
<el-select v-model="queryParams.region" placeholder="请选择区域" clearable size="small">
<el-option
v-for="dict in workTypeOptions"
:key="dict.dictValue"
:label="dict.dictLabel"
:value="dict.dictValue"
/>
</el-select>
</el-form-item>
<el-form-item> <el-form-item>
<el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button> <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-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
...@@ -76,13 +84,14 @@ ...@@ -76,13 +84,14 @@
<el-table v-loading="loading" :data="settingList" @selection-change="handleSelectionChange"> <el-table v-loading="loading" :data="settingList" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" align="center" /> <el-table-column type="selection" width="55" align="center" />
<el-table-column label="排序" align="center" prop="patrolSort" /> <el-table-column label="排序" width="150" align="center" prop="patrolSort" />
<el-table-column label="巡检地点" align="center" prop="patrolAddress" /> <el-table-column label="巡检地点" width="200" align="center" prop="patrolAddress" />
<el-table-column label="巡检内容" align="center" prop="patrolComent" > <el-table-column label="巡检区域" width="200" align="center" prop="nickName" />
<el-table-column label="巡检内容" width="750" align="center" prop="patrolComent" >
<span slot-scope="scope" v-if="scope.row.patrolComent">{{scope.row.patrolComent}}</span> <span slot-scope="scope" v-if="scope.row.patrolComent">{{scope.row.patrolComent}}</span>
<span v-else>-</span> <span v-else>-</span>
</el-table-column> </el-table-column>
<el-table-column label="巡检频次" align="center" prop="patrolFrequency" > <el-table-column label="巡检频次" width="250" align="center" prop="patrolFrequency" >
<span slot-scope="scope" v-if="scope.row.patrolFrequency">{{scope.row.patrolFrequency}}</span> <span slot-scope="scope" v-if="scope.row.patrolFrequency">{{scope.row.patrolFrequency}}</span>
<span v-else>-</span> <span v-else>-</span>
</el-table-column> </el-table-column>
...@@ -124,6 +133,16 @@ ...@@ -124,6 +133,16 @@
<el-form-item label="排序" prop="patrolSort"> <el-form-item label="排序" prop="patrolSort">
<el-input v-model="form.patrolSort" placeholder="请输入排序" /> <el-input v-model="form.patrolSort" placeholder="请输入排序" />
</el-form-item> </el-form-item>
<el-form-item label="巡检区域" prop="region">
<el-select v-model="form.region" style="width: 100%" placeholder="请选择区域" clearable size="small">
<el-option
v-for="dict in workTypeOptions"
:key="dict.dictValue"
:label="dict.dictLabel"
:value="dict.dictValue"
/>
</el-select>
</el-form-item>
<el-form-item label="巡检地点" prop="patrolAddress"> <el-form-item label="巡检地点" prop="patrolAddress">
<el-input v-model="form.patrolAddress" placeholder="请输入巡检地点" /> <el-input v-model="form.patrolAddress" placeholder="请输入巡检地点" />
</el-form-item> </el-form-item>
...@@ -143,152 +162,6 @@ ...@@ -143,152 +162,6 @@
</div> </div>
</el-dialog> </el-dialog>
</div> </div>
</el-tab-pane>
<el-tab-pane label="罐区" name="1">
<div class="app-container">
<el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px">
<el-form-item label="巡检地点" prop="patrolAddress">
<el-input
v-model="queryParams.patrolAddress"
placeholder="请输入巡检地点"
clearable
size="small"
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="nfc编号" prop="nfcNum">
<el-input
v-model="queryParams.nfcNum"
placeholder="请输入nfc编号"
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="['system:setting: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="['system:setting: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="['system:setting: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="['system:setting:export']"
>导出</el-button>
</el-col>
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
</el-row>
<el-table v-loading="loading" :data="settingList" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" align="center" />
<el-table-column label="排序" align="center" prop="patrolSort" />
<el-table-column label="巡检地点" align="center" prop="patrolAddress" />
<el-table-column label="巡检内容" align="center" prop="patrolComent" >
<span slot-scope="scope" v-if="scope.row.patrolComent">{{scope.row.patrolComent}}</span>
<span v-else>-</span>
</el-table-column>
<el-table-column label="巡检频次" align="center" prop="patrolFrequency" >
<span slot-scope="scope" v-if="scope.row.patrolFrequency">{{scope.row.patrolFrequency}}</span>
<span v-else>-</span>
</el-table-column>
<el-table-column label="nfc编号" align="center" prop="nfcNum" >
<span slot-scope="scope" v-if="scope.row.nfcNum">{{scope.row.nfcNum}}</span>
<span v-else>-</span>
</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="['system:setting:edit']"
>修改</el-button>
<el-button
size="mini"
type="text"
icon="el-icon-delete"
@click="handleDelete(scope.row)"
v-hasPermi="['system:setting: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"
/>
<!-- 添加或修改setting对话框 -->
<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="patrolSort">
<el-input v-model="form.patrolSort" placeholder="请输入排序" />
</el-form-item>
<el-form-item label="巡检地点" prop="patrolAddress">
<el-input v-model="form.patrolAddress" placeholder="请输入巡检地点" />
</el-form-item>
<el-form-item label="巡检频次" prop="patrolFrequency">
<el-input v-model="form.patrolFrequency" placeholder="请输入巡检频次" />
</el-form-item>
<el-form-item label="nfc编号" prop="nfcNum">
<el-input v-model="form.nfcNum" placeholder="请输入nfc编号" />
</el-form-item>
<el-form-item label="巡检内容" prop="patrolComent">
<el-input v-model="form.patrolComent" type="textarea" 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>
</el-tab-pane>
</el-tabs>
</template> </template>
<script> <script>
...@@ -300,6 +173,8 @@ export default { ...@@ -300,6 +173,8 @@ export default {
}, },
data() { data() {
return { return {
//查询下拉框数据
workTypeOptions: [],
activeName: '0', activeName: '0',
// 遮罩层 // 遮罩层
loading: true, loading: true,
...@@ -327,7 +202,7 @@ export default { ...@@ -327,7 +202,7 @@ export default {
pageSize: 10, pageSize: 10,
patrolAddress: null, patrolAddress: null,
nfcNum: null, nfcNum: null,
region:'0', region:null,
}, },
// 表单参数 // 表单参数
form: {}, form: {},
...@@ -339,32 +214,20 @@ export default { ...@@ -339,32 +214,20 @@ export default {
patrolSort: [ patrolSort: [
{ required: true, message: "排序不能为空", trigger: "blur" } { required: true, message: "排序不能为空", trigger: "blur" }
], ],
region:[
{ required: true, message: "请选择巡检区域", trigger: "blur" }
],
} }
}; };
}, },
created() { created() {
this.getList(); this.getList();
this.getDicts("t_nfc_region").then(response => {
this.workTypeOptions = response.data;
});
}, },
methods: { methods: {
handleClick(tab, event) {
//0 氨合成 1 罐区
if (event.originalTarget.id=='tab-0'){
this.queryParams.region=0;
listSetting(this.queryParams).then(response => {
this.settingList = response.rows;
this.total = response.total;
this.loading = false;
});
}else {
this.queryParams.region=1;
listSetting(this.queryParams).then(response => {
this.settingList = response.rows;
this.total = response.total;
this.loading = false;
});
}
},
/** 查询setting列表 */ /** 查询setting列表 */
getList() { getList() {
this.loading = true; this.loading = true;
...@@ -389,7 +252,8 @@ export default { ...@@ -389,7 +252,8 @@ export default {
patrolFrequency: null, patrolFrequency: null,
nfcNum: null, nfcNum: null,
createTime: null, createTime: null,
isDel: null isDel: null,
region:null,
}; };
this.resetForm("form"); this.resetForm("form");
}, },
...@@ -436,7 +300,6 @@ export default { ...@@ -436,7 +300,6 @@ export default {
this.getList(); this.getList();
}); });
} else { } else {
this.form.region= this.queryParams.region;
addSetting(this.form).then(response => { addSetting(this.form).then(response => {
this.msgSuccess("新增成功"); this.msgSuccess("新增成功");
this.open = false; this.open = false;
......
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