巡检签到

gassafety-admin/src/main/java/com/zehong/web/controller/patrolCheckIn/TPatrolCheckInController.java

+package com.zehong.web.controller.patrolCheckIn;
+
+import java.util.List;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import com.zehong.common.annotation.Log;
+import com.zehong.common.core.controller.BaseController;
+import com.zehong.common.core.domain.AjaxResult;
+import com.zehong.common.enums.BusinessType;
+import com.zehong.system.domain.TPatrolCheckIn;
+import com.zehong.system.service.ITPatrolCheckInService;
+import com.zehong.common.utils.poi.ExcelUtil;
+import com.github.pagehelper.PageInfo;
+import com.zehong.common.core.page.TableDataInfo;
+
+/**
+ * 巡检签到Controller
+ * 
+ * @author zehong
+ * @date 2023-03-02
+ */
+@RestController
+@RequestMapping("/patorl/checkIn")
+public class TPatrolCheckInController extends BaseController
+{
+    @Autowired
+    private ITPatrolCheckInService tPatrolCheckInService;
+
+     /**
+     * 查询巡检签到列表
+     */
+    @PreAuthorize("@ss.hasPermi('system:in:list')")
+    @GetMapping("/list")
+    public TableDataInfo list(TPatrolCheckIn tPatrolCheckIn)
+    {
+        startPage();
+        PageInfo<TPatrolCheckIn> list = tPatrolCheckInService.selectTPatrolCheckInPage(tPatrolCheckIn);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出巡检签到列表
+     */
+    @PreAuthorize("@ss.hasPermi('system:in:export')")
+    @Log(title = "巡检签到", businessType = BusinessType.EXPORT)
+    @GetMapping("/export")
+    public AjaxResult export(TPatrolCheckIn tPatrolCheckIn)
+    {
+        List<TPatrolCheckIn> list = tPatrolCheckInService.selectTPatrolCheckInList(tPatrolCheckIn);
+        ExcelUtil<TPatrolCheckIn> util = new ExcelUtil<TPatrolCheckIn>(TPatrolCheckIn.class);
+        return util.exportExcel(list, "巡检签到数据");
+    }
+
+    /**
+     * 获取巡检签到详细信息
+     */
+    @PreAuthorize("@ss.hasPermi('system:in:query')")
+    @GetMapping(value = "/{checkInId}")
+    public AjaxResult getInfo(@PathVariable("checkInId") Long checkInId)
+    {
+        return AjaxResult.success(tPatrolCheckInService.selectTPatrolCheckInById(checkInId));
+    }
+
+    /**
+     * 新增巡检签到
+     */
+    @PreAuthorize("@ss.hasPermi('system:in:add')")
+    @Log(title = "巡检签到", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody TPatrolCheckIn tPatrolCheckIn)
+    {
+        return toAjax(tPatrolCheckInService.insertTPatrolCheckIn(tPatrolCheckIn));
+    }
+
+    /**
+     * 修改巡检签到
+     */
+    @PreAuthorize("@ss.hasPermi('system:in:edit')")
+    @Log(title = "巡检签到", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@RequestBody TPatrolCheckIn tPatrolCheckIn)
+    {
+        return toAjax(tPatrolCheckInService.updateTPatrolCheckIn(tPatrolCheckIn));
+    }
+
+    /**
+     * 删除巡检签到
+     */
+    @PreAuthorize("@ss.hasPermi('system:in:remove')")
+    @Log(title = "巡检签到", businessType = BusinessType.DELETE)
+	@DeleteMapping("/{chenckInIds}")
+    public AjaxResult remove(@PathVariable Long[] chenckInIds)
+    {
+        return toAjax(tPatrolCheckInService.deleteTPatrolCheckInByIds(chenckInIds));
+    }
+}

gassafety-system/src/main/java/com/zehong/system/domain/TPatrolCheckIn.java

+package com.zehong.system.domain;
+
+import java.math.BigDecimal;
+import java.util.Date;
+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.core.domain.BaseEntity;
+
+/**
+ * 巡检签到对象 t_patrol_check_in
+ * 
+ * @author zehong
+ * @date 2023-03-02
+ */
+public class TPatrolCheckIn extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 签到id */
+    private Long checkInId;
+
+    /** 设备名称 */
+    @Excel(name = "设备名称")
+    private String deviceName;
+
+    /** 照片地址 */
+    @Excel(name = "照片地址")
+    private String photoUrl;
+
+    /** 描述 */
+    @Excel(name = "描述")
+    private String patrolDescribe;
+
+    /** 上报时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @Excel(name = "上报时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
+    private Date reportTime;
+
+    /** 上报人 */
+    @Excel(name = "上报人")
+    private Long reportPerson;
+
+    /** 经度 */
+    @Excel(name = "经度")
+    private BigDecimal longitude;
+
+    /** 纬度 */
+    @Excel(name = "纬度")
+    private BigDecimal latitude;
+
+    /** 是否删除(0正常，1删除) */
+    @Excel(name = "是否删除(0正常，1删除)")
+    private String isDel;
+
+    private String personName;
+
+    private Date reportTimeBegin;
+
+    private Date reportTimeEnd;
+
+    public void setCheckInId(Long checkInId)
+    {
+        this.checkInId = checkInId;
+    }
+
+    public Long getCheckInId()
+    {
+        return checkInId;
+    }
+    public void setDeviceName(String deviceName) 
+    {
+        this.deviceName = deviceName;
+    }
+
+    public String getDeviceName() 
+    {
+        return deviceName;
+    }
+    public void setPhotoUrl(String photoUrl) 
+    {
+        this.photoUrl = photoUrl;
+    }
+
+    public String getPhotoUrl() 
+    {
+        return photoUrl;
+    }
+    public void setPatrolDescribe(String patrolDescribe)
+    {
+        this.patrolDescribe = patrolDescribe;
+    }
+
+    public String getPatrolDescribe()
+    {
+        return patrolDescribe;
+    }
+    public void setReportTime(Date reportTime) 
+    {
+        this.reportTime = reportTime;
+    }
+
+    public Date getReportTime() 
+    {
+        return reportTime;
+    }
+    public void setReportPerson(Long reportPerson) 
+    {
+        this.reportPerson = reportPerson;
+    }
+
+    public Long getReportPerson() 
+    {
+        return reportPerson;
+    }
+    public void setLongitude(BigDecimal longitude) 
+    {
+        this.longitude = longitude;
+    }
+
+    public BigDecimal getLongitude() 
+    {
+        return longitude;
+    }
+    public void setLatitude(BigDecimal latitude) 
+    {
+        this.latitude = latitude;
+    }
+
+    public BigDecimal getLatitude() 
+    {
+        return latitude;
+    }
+    public void setIsDel(String isDel) 
+    {
+        this.isDel = isDel;
+    }
+
+    public String getIsDel() 
+    {
+        return isDel;
+    }
+
+    public String getPersonName() {
+        return personName;
+    }
+
+    public void setPersonName(String personName) {
+        this.personName = personName;
+    }
+
+    public Date getReportTimeBegin() {
+        return reportTimeBegin;
+    }
+
+    public void setReportTimeBegin(Date reportTimeBegin) {
+        this.reportTimeBegin = reportTimeBegin;
+    }
+
+    public Date getReportTimeEnd() {
+        return reportTimeEnd;
+    }
+
+    public void setReportTimeEnd(Date reportTimeEnd) {
+        this.reportTimeEnd = reportTimeEnd;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("checkInId", getCheckInId())
+            .append("deviceName", getDeviceName())
+            .append("photoUrl", getPhotoUrl())
+            .append("patrolDescribe", getPatrolDescribe())
+            .append("reportTime", getReportTime())
+            .append("reportPerson", getReportPerson())
+            .append("longitude", getLongitude())
+            .append("latitude", getLatitude())
+            .append("isDel", getIsDel())
+            .append("remark", getRemark())
+            .toString();
+    }
+}

gassafety-system/src/main/java/com/zehong/system/mapper/TPatrolCheckInMapper.java

+package com.zehong.system.mapper;
+
+import java.util.List;
+import com.zehong.system.domain.TPatrolCheckIn;
+
+/**
+ * 巡检签到Mapper接口
+ * 
+ * @author zehong
+ * @date 2023-03-02
+ */
+public interface TPatrolCheckInMapper 
+{
+    /**
+     * 查询巡检签到
+     * 
+     * @param chenckInId 巡检签到ID
+     * @return 巡检签到
+     */
+    public TPatrolCheckIn selectTPatrolCheckInById(Long chenckInId);
+
+    /**
+     * 查询巡检签到列表
+     * 
+     * @param tPatrolCheckIn 巡检签到
+     * @return 巡检签到集合
+     */
+    public List<TPatrolCheckIn> selectTPatrolCheckInList(TPatrolCheckIn tPatrolCheckIn);
+
+    /**
+     * 新增巡检签到
+     * 
+     * @param tPatrolCheckIn 巡检签到
+     * @return 结果
+     */
+    public int insertTPatrolCheckIn(TPatrolCheckIn tPatrolCheckIn);
+
+    /**
+     * 修改巡检签到
+     * 
+     * @param tPatrolCheckIn 巡检签到
+     * @return 结果
+     */
+    public int updateTPatrolCheckIn(TPatrolCheckIn tPatrolCheckIn);
+
+    /**
+     * 删除巡检签到
+     * 
+     * @param chenckInId 巡检签到ID
+     * @return 结果
+     */
+    public int deleteTPatrolCheckInById(Long chenckInId);
+
+    /**
+     * 批量删除巡检签到
+     * 
+     * @param chenckInIds 需要删除的数据ID
+     * @return 结果
+     */
+    public int deleteTPatrolCheckInByIds(Long[] chenckInIds);
+}

gassafety-system/src/main/java/com/zehong/system/service/ITPatrolCheckInService.java

+package com.zehong.system.service;
+
+import java.util.List;
+import com.zehong.system.domain.TPatrolCheckIn;
+import com.github.pagehelper.PageInfo;
+
+/**
+ * 巡检签到Service接口
+ * 
+ * @author zehong
+ * @date 2023-03-02
+ */
+public interface ITPatrolCheckInService 
+{
+    /**
+     * 查询巡检签到
+     * 
+     * @param chenckInId 巡检签到ID
+     * @return 巡检签到
+     */
+    public TPatrolCheckIn selectTPatrolCheckInById(Long chenckInId);
+
+    /**
+     * 查询巡检签到列表
+     * 
+     * @param tPatrolCheckIn 巡检签到
+     * @return 巡检签到集合
+     */
+    public List<TPatrolCheckIn> selectTPatrolCheckInList(TPatrolCheckIn tPatrolCheckIn);
+
+    /**
+     * 查询巡检签到分页列表
+     *
+     * @param tPatrolCheckIn 巡检签到
+     * @return 巡检签到分页集合
+     */
+    public PageInfo<TPatrolCheckIn> selectTPatrolCheckInPage(TPatrolCheckIn tPatrolCheckIn);
+
+    /**
+     * 新增巡检签到
+     * 
+     * @param tPatrolCheckIn 巡检签到
+     * @return 结果
+     */
+    public int insertTPatrolCheckIn(TPatrolCheckIn tPatrolCheckIn);
+
+    /**
+     * 修改巡检签到
+     * 
+     * @param tPatrolCheckIn 巡检签到
+     * @return 结果
+     */
+    public int updateTPatrolCheckIn(TPatrolCheckIn tPatrolCheckIn);
+
+    /**
+     * 批量删除巡检签到
+     * 
+     * @param chenckInIds 需要删除的巡检签到ID
+     * @return 结果
+     */
+    public int deleteTPatrolCheckInByIds(Long[] chenckInIds);
+
+    /**
+     * 删除巡检签到信息
+     * 
+     * @param chenckInId 巡检签到ID
+     * @return 结果
+     */
+    public int deleteTPatrolCheckInById(Long chenckInId);
+}

gassafety-system/src/main/java/com/zehong/system/service/impl/TPatrolCheckInServiceImpl.java

+package com.zehong.system.service.impl;
+
+import java.util.List;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import com.zehong.system.mapper.TPatrolCheckInMapper;
+import com.zehong.system.domain.TPatrolCheckIn;
+import com.zehong.system.service.ITPatrolCheckInService;
+import com.github.pagehelper.PageInfo;
+
+/**
+ * 巡检签到Service业务层处理
+ * 
+ * @author zehong
+ * @date 2023-03-02
+ */
+@Service
+public class TPatrolCheckInServiceImpl implements ITPatrolCheckInService 
+{
+    @Autowired
+    private TPatrolCheckInMapper tPatrolCheckInMapper;
+
+    /**
+     * 查询巡检签到
+     * 
+     * @param chenckInId 巡检签到ID
+     * @return 巡检签到
+     */
+    @Override
+    public TPatrolCheckIn selectTPatrolCheckInById(Long chenckInId)
+    {
+        return tPatrolCheckInMapper.selectTPatrolCheckInById(chenckInId);
+    }
+
+    /**
+     * 查询巡检签到列表
+     * 
+     * @param tPatrolCheckIn 巡检签到
+     * @return 巡检签到
+     */
+    @Override
+    public List<TPatrolCheckIn> selectTPatrolCheckInList(TPatrolCheckIn tPatrolCheckIn)
+    {
+        return tPatrolCheckInMapper.selectTPatrolCheckInList(tPatrolCheckIn);
+    }
+
+    /**
+     * 查询巡检签到分页列表
+     *
+     * @param tPatrolCheckIn 巡检签到
+     * @return 巡检签到
+     */
+    @Override
+    public PageInfo<TPatrolCheckIn> selectTPatrolCheckInPage(TPatrolCheckIn tPatrolCheckIn)
+    {
+        return new PageInfo(tPatrolCheckInMapper.selectTPatrolCheckInList(tPatrolCheckIn));
+    }
+
+    /**
+     * 新增巡检签到
+     * 
+     * @param tPatrolCheckIn 巡检签到
+     * @return 结果
+     */
+    @Override
+    public int insertTPatrolCheckIn(TPatrolCheckIn tPatrolCheckIn)
+    {
+        return tPatrolCheckInMapper.insertTPatrolCheckIn(tPatrolCheckIn);
+    }
+
+    /**
+     * 修改巡检签到
+     * 
+     * @param tPatrolCheckIn 巡检签到
+     * @return 结果
+     */
+    @Override
+    public int updateTPatrolCheckIn(TPatrolCheckIn tPatrolCheckIn)
+    {
+        return tPatrolCheckInMapper.updateTPatrolCheckIn(tPatrolCheckIn);
+    }
+
+    /**
+     * 批量删除巡检签到
+     * 
+     * @param chenckInIds 需要删除的巡检签到ID
+     * @return 结果
+     */
+    @Override
+    public int deleteTPatrolCheckInByIds(Long[] chenckInIds)
+    {
+        return tPatrolCheckInMapper.deleteTPatrolCheckInByIds(chenckInIds);
+    }
+
+    /**
+     * 删除巡检签到信息
+     * 
+     * @param chenckInId 巡检签到ID
+     * @return 结果
+     */
+    @Override
+    public int deleteTPatrolCheckInById(Long chenckInId)
+    {
+        return tPatrolCheckInMapper.deleteTPatrolCheckInById(chenckInId);
+    }
+}

gassafety-system/src/main/resources/mapper/system/TPatrolCheckInMapper.xml

+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.zehong.system.mapper.TPatrolCheckInMapper">
+    
+    <resultMap type="TPatrolCheckIn" id="TPatrolCheckInResult">
+        <result property="checkInId"    column="check_in_id"    />
+        <result property="deviceName"    column="device_name"    />
+        <result property="photoUrl"    column="photo_url"    />
+        <result property="patrolDescribe"    column="patrol_describe"    />
+        <result property="reportTime"    column="report_time"    />
+        <result property="reportPerson"    column="report_person"    />
+        <result property="longitude"    column="longitude"    />
+        <result property="latitude"    column="latitude"    />
+        <result property="isDel"    column="is_del"    />
+        <result property="remark"    column="remark"    />
+        <result property="personName"    column="person_name"    />
+    </resultMap>
+
+    <sql id="selectTPatrolCheckInVo">
+        SELECT
+            patrol.check_in_id,
+            patrol.device_name,
+            patrol.photo_url,
+            patrol.patrol_describe,
+            patrol.report_time,
+            patrol.report_person,
+            patrol.longitude,
+            patrol.latitude,
+            patrol.is_del,
+            patrol.remark,
+          u.nick_name AS person_name
+        FROM
+            t_patrol_check_in patrol
+        LEFT JOIN sys_user u ON patrol.report_person = u.user_id
+    </sql>
+
+    <select id="selectTPatrolCheckInList" parameterType="TPatrolCheckIn" resultMap="TPatrolCheckInResult">
+        <include refid="selectTPatrolCheckInVo"/>
+        <where>  
+            <if test="deviceName != null  and deviceName != ''"> and patrol.device_name like concat('%', #{deviceName}, '%')</if>
+            <if test="photoUrl != null  and photoUrl != ''"> and patrol.photo_url = #{photoUrl}</if>
+            <if test="patrolDescribe != null  and patrolDescribe != ''"> and patrol.patrol_describe = #{patrolDescribe}</if>
+            <if test="reportTimeBegin != null and reportTimeEnd != null"> and patrol.report_time BETWEEN #{reportTimeBegin} AND #{reportTimeEnd}</if>
+            <if test="reportPerson != null "> and patrol.report_person = #{reportPerson}</if>
+            <if test="longitude != null "> and patrol.longitude = #{longitude}</if>
+            <if test="latitude != null "> and patrol.latitude = #{latitude}</if>
+            <if test="isDel != null  and isDel != ''"> and patrol.is_del = #{isDel}</if>
+        </where>
+    </select>
+    
+    <select id="selectTPatrolCheckInById" parameterType="Long" resultMap="TPatrolCheckInResult">
+        <include refid="selectTPatrolCheckInVo"/>
+        where patrol.check_in_id = #{checkInId}
+    </select>
+        
+    <insert id="insertTPatrolCheckIn" parameterType="TPatrolCheckIn" useGeneratedKeys="true" keyProperty="checkInId">
+        insert into t_patrol_check_in
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="deviceName != null">device_name,</if>
+            <if test="photoUrl != null">photo_url,</if>
+            <if test="patrolDescribe != null">patrol_describe,</if>
+            <if test="reportTime != null">report_time,</if>
+            <if test="reportPerson != null">report_person,</if>
+            <if test="longitude != null">longitude,</if>
+            <if test="latitude != null">latitude,</if>
+            <if test="isDel != null">is_del,</if>
+            <if test="remark != null">remark,</if>
+         </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="deviceName != null">#{deviceName},</if>
+            <if test="photoUrl != null">#{photoUrl},</if>
+            <if test="patrolDescribe != null">#{patrolDescribe},</if>
+            <if test="reportTime != null">#{reportTime},</if>
+            <if test="reportPerson != null">#{reportPerson},</if>
+            <if test="longitude != null">#{longitude},</if>
+            <if test="latitude != null">#{latitude},</if>
+            <if test="isDel != null">#{isDel},</if>
+            <if test="remark != null">#{remark},</if>
+         </trim>
+    </insert>
+
+    <update id="updateTPatrolCheckIn" parameterType="TPatrolCheckIn">
+        update t_patrol_check_in
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="deviceName != null">device_name = #{deviceName},</if>
+            <if test="photoUrl != null">photo_url = #{photoUrl},</if>
+            <if test="patrolDescribe != null">patrol_describe = #{patrolDescribe},</if>
+            <if test="reportTime != null">report_time = #{reportTime},</if>
+            <if test="reportPerson != null">report_person = #{reportPerson},</if>
+            <if test="longitude != null">longitude = #{longitude},</if>
+            <if test="latitude != null">latitude = #{latitude},</if>
+            <if test="isDel != null">is_del = #{isDel},</if>
+            <if test="remark != null">remark = #{remark},</if>
+        </trim>
+        where check_in_id = #{checkInId}
+    </update>
+
+    <delete id="deleteTPatrolCheckInById" parameterType="Long">
+        delete from t_patrol_check_in where check_in_id = #{checkInId}
+    </delete>
+
+    <delete id="deleteTPatrolCheckInByIds" parameterType="String">
+        delete from t_patrol_check_in where check_in_id in
+        <foreach item="checkInId" collection="array" open="(" separator="," close=")">
+            #{checkInId}
+        </foreach>
+    </delete>
+</mapper>
\ No newline at end of file

gassafety-web/src/api/patrolCheckIn/checkIn.js

+import request from '@/utils/request'
+
+// 查询巡检签到列表
+export function listCheckIn(query) {
+  return request({
+    url: '/patorl/checkIn/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询巡检签到详细
+export function getCheckIn(chenckInId) {
+  return request({
+    url: '/patorl/checkIn/' + chenckInId,
+    method: 'get'
+  })
+}
+
+// 新增巡检签到
+export function addCheckIn(data) {
+  return request({
+    url: '/patorl/checkIn',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改巡检签到
+export function updateCheckIn(data) {
+  return request({
+    url: '/patorl/checkIn',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除巡检签到
+export function delCheckIn(chenckInId) {
+  return request({
+    url: '/patorl/checkIn/' + chenckInId,
+    method: 'delete'
+  })
+}
+
+// 导出巡检签到
+export function exportCheckIn(query) {
+  return request({
+    url: '/patorl/checkIn/export',
+    method: 'get',
+    params: query
+  })
+}

gassafety-web/src/utils/gaodeMap.js

@@ -103,6 +103,9 @@ class gaodeMap {
     });
     // 鼠标在地图上移动
     this.myMap.on("mousemove", e => {
+      if(!this.mouseTool){
+         return;
+      }
       if (this.mouseTool.overlays.polyline.length > 0) {
         const arr = this.mouseTool.overlays.polyline;
         const length = parseInt(arr[0].getLength());

gassafety-web/src/views/patrolCheckIn/index.vue

+<template>
+  <div class="app-container">
+    <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px">
+      <el-form-item label="设备名称" prop="deviceName">
+        <el-input
+          v-model="queryParams.deviceName"
+          placeholder="请输入设备名称"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="上报时间" prop="reportTime">
+        <el-date-picker
+          v-model="reportTime"
+          value-format="yyyy-MM-dd HH:mm:ss"
+          type="datetimerange"
+          range-separator="至"
+          start-placeholder="上报开始日期"
+          end-placeholder="上报结束日期"
+          @change="dateFormat">
+        </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="['system:in: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:in: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:in: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:in:export']"
+        >导出</el-button>
+      </el-col>
+      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+    </el-row>-->
+
+    <el-table v-loading="loading" :data="inList">
+     <!-- <el-table-column type="selection" width="55" align="center" />
+      <el-table-column label="签到id" align="center" prop="checkInId" />-->
+      <el-table-column label="设备名称" align="center" prop="deviceName" />
+      <el-table-column label="照片" align="center" prop="photoUrl">
+        <template slot-scope="scope">
+          <el-image :src="scope.row.photoUrl" :preview-src-list="[scope.row.photoUrl]" :z-index="9999" style="width: 30px;height: 30px;"></el-image>
+        </template>
+      </el-table-column>
+      <el-table-column label="描述" align="center" prop="patrolDescribe" min-width="100" :show-overflow-tooltip="true"/>
+      <el-table-column label="上报时间" align="center" prop="reportTime" width="180">
+        <template slot-scope="scope">
+          <span>{{ parseTime(scope.row.reportTime, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="上报人" align="center" prop="personName"/>
+      <!--<el-table-column label="经度" align="center" prop="longitude" />
+      <el-table-column label="纬度" align="center" prop="latitude" />
+      <el-table-column label="是否删除(0正常，1删除)" align="center" prop="isDel" />
+      <el-table-column label="备注" align="center" prop="remark" />-->
+      <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-copy-document"
+            @click="handleDetail(scope.row)"
+            v-hasPermi="['system:in:query']"
+          >详情</el-button>
+          <!--<el-button
+            size="mini"
+            type="text"
+            icon="el-icon-delete"
+            @click="handleDelete(scope.row)"
+            v-hasPermi="['system:in: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="deviceName">
+          <el-input v-model="form.deviceName" placeholder="请输入设备名称" />
+        </el-form-item>
+        <el-form-item label="照片地址" prop="photoUrl">
+          <el-input v-model="form.photoUrl" type="textarea" placeholder="请输入内容" />
+        </el-form-item>
+        <el-form-item label="描述" prop="describe">
+          <el-input v-model="form.patrolDescribe" type="textarea" placeholder="请输入内容" />
+        </el-form-item>
+        <el-form-item label="上报时间" prop="reportTime">
+          <el-date-picker clearable size="small"
+            v-model="form.reportTime"
+            type="date"
+            value-format="yyyy-MM-dd"
+            placeholder="选择上报时间">
+          </el-date-picker>
+        </el-form-item>
+        <el-form-item label="上报人" prop="reportPerson">
+          <el-input v-model="form.reportPerson" placeholder="请输入上报人" />
+        </el-form-item>
+        <el-form-item label="经度" prop="longitude">
+          <el-input v-model="form.longitude" placeholder="请输入经度" />
+        </el-form-item>
+        <el-form-item label="纬度" prop="latitude">
+          <el-input v-model="form.latitude" placeholder="请输入纬度" />
+        </el-form-item>
+        <el-form-item label="是否删除(0正常，1删除)" prop="isDel">
+          <el-input v-model="form.isDel" placeholder="请输入是否删除(0正常，1删除)" />
+        </el-form-item>
+        <el-form-item label="备注" prop="remark">
+          <el-input v-model="form.remark" 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>
+
+    <!-- 详情 -->
+    <el-dialog title="详情" :visible.sync="openDetail" width="1000px" append-to-body>
+      <el-form ref="form" :model="form" label-width="80px">
+        <el-row>
+          <el-col :span="12">
+            <el-form-item label="设备名称:" prop="deviceName">
+              <span>{{ form.deviceName }}</span>
+            </el-form-item>
+            <el-form-item label="照片:" prop="photoUrl">
+              <el-image :src="form.photoUrl" :preview-src-list="[form.photoUrl]" :z-index="9999" style="width: 100px;height: 100px;"></el-image>
+            </el-form-item>
+            <el-form-item label="描述:" prop="patrolDescribe">
+              <span>{{ form.patrolDescribe }}</span>
+            </el-form-item>
+            <el-form-item label="上报时间:" prop="reportTime">
+              <span>{{ form.reportTime }}</span>
+            </el-form-item>
+            <el-form-item label="上报人:" prop="reportPerson">
+              <span>{{ form.personName }}</span>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <div style="width: 100%;height: 370px; border: 1px solid rgb(218, 213, 213);">
+              <div style="width: 100%;height: 100%" id="container"></div>
+            </div>
+          </el-col>
+        </el-row>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button @click="openDetail == false">取 消</el-button>
+      </div>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import { listCheckIn, getCheckIn, delCheckIn, addCheckIn, updateCheckIn, exportCheckIn } from "@/api/patrolCheckIn/checkIn";
+import gaodeMap from "utils/gaodeMap.js";
+import { map, DEVICE_TYPE } from "utils/gaodeMap.js";
+import { getUser } from "@/api/system/user.js";
+export default {
+  name: "In",
+  components: {
+  },
+  data() {
+    return {
+      // 遮罩层
+      loading: true,
+      // 导出遮罩层
+      exportLoading: false,
+      // 选中数组
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // 巡检签到表格数据
+      inList: [],
+      // 弹出层标题
+      title: "",
+      // 是否显示弹出层
+      open: false,
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        deviceName: null,
+        photoUrl: null,
+        patrolDescribe: null,
+        reportTime: null,
+        reportPerson: null,
+        longitude: null,
+        latitude: null,
+        isDel: null
+      },
+      // 表单参数
+      form: {},
+      // 表单校验
+      rules: {
+      },
+      openDetail: false,
+      reportTime: ""
+    };
+  },
+  created() {
+    this.getList();
+  },
+  methods: {
+    /** 查询巡检签到列表 */
+    getList() {
+      this.loading = true;
+      listCheckIn(this.queryParams).then(response => {
+        this.inList = response.rows;
+        this.total = response.total;
+        this.loading = false;
+      });
+    },
+    // 取消按钮
+    cancel() {
+      this.open = false;
+      this.reset();
+    },
+    // 表单重置
+    reset() {
+      this.form = {
+        checkInId: null,
+        deviceName: null,
+        photoUrl: null,
+        describe: null,
+        reportTime: null,
+        reportPerson: null,
+        longitude: null,
+        latitude: null,
+        isDel: null,
+        remark: null
+      };
+      this.resetForm("form");
+    },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.queryParams.pageNum = 1;
+      this.getList();
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.resetForm("queryForm");
+      this.reportTime = [];
+      this.queryParams.reportTimeBegin = null;
+      this.queryParams.reportTimeEnd = null;
+      this.handleQuery();
+    },
+    // 多选框选中数据
+    handleSelectionChange(selection) {
+      this.ids = selection.map(item => item.checkInId)
+      this.single = selection.length!==1
+      this.multiple = !selection.length
+    },
+    /** 新增按钮操作 */
+    handleAdd() {
+      this.reset();
+      this.open = true;
+      this.title = "添加巡检签到";
+    },
+    /** 修改按钮操作 */
+    handleUpdate(row) {
+      this.reset();
+      const checkInId = row.checkInId || this.ids
+      getCheckIn(checkInId).then(response => {
+        this.form = response.data;
+        this.open = true;
+        this.title = "修改巡检签到";
+      });
+    },
+    handleDetail(row){
+      const checkInId = row.checkInId || this.ids
+      getCheckIn(checkInId).then(response => {
+        this.form = response.data;
+        this.openDetail = true;
+        this.initGaoMap(this.form);
+      });
+    },
+    initGaoMap(data){
+      this.$nextTick(() => {
+        let gaomap = new gaodeMap(process.env.VUE_APP_MAP_CENTER);
+        gaomap.addMarker("",data,"false");
+      })
+    },
+    /** 提交按钮 */
+    submitForm() {
+      this.$refs["form"].validate(valid => {
+        if (valid) {
+          if (this.form.checkInId != null) {
+            updateCheckIn(this.form).then(response => {
+              this.msgSuccess("修改成功");
+              this.open = false;
+              this.getList();
+            });
+          } else {
+            addCheckIn(this.form).then(response => {
+              this.msgSuccess("新增成功");
+              this.open = false;
+              this.getList();
+            });
+          }
+        }
+      });
+    },
+    /** 删除按钮操作 */
+    handleDelete(row) {
+      const checkInIds = row.checkInId || this.ids;
+      this.$confirm('是否确认删除巡检签到编号为"' + checkInIds + '"的数据项?', "警告", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning"
+        }).then(function() {
+          return delCheckIn(checkInIds);
+        }).then(() => {
+          this.getList();
+          this.msgSuccess("删除成功");
+        }).catch(() => {});
+    },
+    /** 导出按钮操作 */
+    handleExport() {
+      const queryParams = this.queryParams;
+      this.$confirm('是否确认导出所有巡检签到数据项?', "警告", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning"
+        }).then(() => {
+          this.exportLoading = true;
+          return exportCheckIn(queryParams);
+        }).then(response => {
+          this.download(response.msg);
+          this.exportLoading = false;
+        }).catch(() => {});
+    },
+    dateFormat(picker){
+      this.reportTime = picker;
+      this.queryParams.reportTimeBegin = picker[0];
+      this.queryParams.reportTimeEnd = picker[1];
+    },
+  }
+};
+</script>