Commit 7dec1a52 authored by 吴卿华's avatar 吴卿华

化工巡检

parent 565588ad
......@@ -58,6 +58,18 @@ public class TNfcSettingController extends BaseController
return getDataTable(list);
}
/**
* 导出巡检打卡列表
*/
@Log(title = "setting", businessType = BusinessType.EXPORT)
@GetMapping("/exportPunchClockList")
public AjaxResult exportPunchClockList(TNfcSetting tNfcSetting)
{
List<TNfcRecord> list = tNfcSettingService.punchClockList(tNfcSetting);
ExcelUtil<TNfcRecord> util = new ExcelUtil<TNfcRecord>(TNfcRecord.class);
return util.exportExcel(list, "巡检打卡数据");
}
/**
* 导出巡检列表
*/
......
......@@ -21,47 +21,41 @@ public class TNfcRecord extends BaseEntity {
/**
* nfc_id
*/
@Excel(name = "nfc_id")
private Long nfcId;
/**
* 是否正常 0否 1是
*/
@Excel(name = "是否正常 0否 1是")
private Integer isNormal;
/**
* 图片地址
*/
@Excel(name = "图片地址")
private String picture;
/**
* 备注
*/
@Excel(name = "备注")
private String remarks;
/**上报时间*/
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date createTime;
/**
* 上报人姓名
*/
@Excel(name = "上报人")
private Long createUser;
/**巡检地点*/
@Excel(name = "巡检地点")
private String patrolAddress;
/**巡检区域*/
@Excel(name = "巡检区域")
private String dictLabel;
/**巡检内容*/
@Excel(name = "巡检内容")
private String patrolComent;
/**巡检频次*/
@Excel(name = "巡检频次")
private String patrolFrequency;
/** 巡检人*/
@Excel(name = "上报人")
private String nickName;
private String userName;
......@@ -70,9 +64,16 @@ public class TNfcRecord extends BaseEntity {
private String endTime;
/**巡检区域*/
private String dictLabel;
/**
* 是否正常 0否 1是
*/
@Excel(name = "巡检结果", readConverterExp = "0=异常,1=正常")
private Integer isNormal;
/**上报时间*/
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@Excel(name = "上报时间",dateFormat = "yyyy-MM-dd HH:mm:ss")
private Date createTime;
/**
* 开始时间
*/
......
......@@ -51,3 +51,12 @@ export function exportSetting(query) {
params: query
})
}
//
export function exportPunchClockList(query) {
return request({
url: '/system/inspection/exportPunchClockList',
method: 'get',
params: query
})
}
......@@ -42,7 +42,7 @@
</el-form-item>
</el-form>
<!-- <el-row :gutter="10" class="mb8">-->
<el-row :gutter="10" class="mb8">
<!-- <el-col :span="1.5">-->
<!-- <el-button-->
<!-- type="primary"-->
......@@ -75,19 +75,19 @@
<!-- 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>-->
<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-row>
<el-table v-loading="loading" :data="settingList" @selection-change="handleSelectionChange">
<el-table-column width="250" label="巡检地点" align="center" prop="patrolAddress" />
......@@ -162,7 +162,7 @@
</template>
<script>
import { listSetting, getSetting, delSetting, addSetting, updateSetting, exportSetting } from "@/api/system/statistics.js";
import { listSetting, getSetting, delSetting, addSetting, updateSetting, exportPunchClockList } from "@/api/system/statistics.js";
export default {
name: "Setting",
......@@ -331,7 +331,7 @@ export default {
type: "warning"
}).then(() => {
this.exportLoading = true;
return exportSetting(queryParams);
return exportPunchClockList(queryParams);
}).then(response => {
this.download(response.msg);
this.exportLoading = false;
......
......@@ -29,22 +29,22 @@
/>
</el-select>
</el-form-item>
<el-form-item label="开始时间" prop="applyWorkStartTime">
<el-date-picker clearable size="small"
v-model="queryParams.applyWorkStartTime"
type="date"
value-format="yyyy-MM-dd"
placeholder="选择开始时间">
</el-date-picker>
</el-form-item>
<el-form-item label="结束时间" prop="applyWorkEndTime">
<el-date-picker clearable size="small"
v-model="queryParams.applyWorkEndTime"
type="date"
value-format="yyyy-MM-dd"
placeholder="选择结束时间">
</el-date-picker>
</el-form-item>
<!-- <el-form-item label="开始时间" prop="applyWorkStartTime">-->
<!-- <el-date-picker clearable size="small"-->
<!-- v-model="queryParams.applyWorkStartTime"-->
<!-- type="date"-->
<!-- value-format="yyyy-MM-dd"-->
<!-- placeholder="选择开始时间">-->
<!-- </el-date-picker>-->
<!-- </el-form-item>-->
<!-- <el-form-item label="结束时间" prop="applyWorkEndTime">-->
<!-- <el-date-picker clearable size="small"-->
<!-- v-model="queryParams.applyWorkEndTime"-->
<!-- 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>
......@@ -115,7 +115,7 @@
<span slot-scope="scope" v-if="scope.row.nfcNum">{{scope.row.nfcNum}}</span>
<span v-else>-</span>
</el-table-column>
<el-table-column label="创建时间" width="170" align="center" prop="createTime" />
<!-- <el-table-column label="创建时间" width="170" align="center" prop="createTime" />-->
<el-table-column label="操作" align="center" class-name="small-padding fixed-width">
<template slot-scope="scope">
<el-button
......
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