巡更轨迹页面调整

czt

15 小时以前 ff7b32281dd46c2761f54181abd80bca055e8719

巡更轨迹页面调整

 fzzy-igdss-core/src/main/java/com/fzzy/igds/domain/EventInfo.java

@@ -99,7 +99,7 @@
    /**
     * --------事件抓图路径名称--------
     **/
    @Column(name = "file_name", columnDefinition = "varchar(50) COMMENT '抓拍照片'")
    @TableField("file_name")
    @Column(name = "img_name", columnDefinition = "varchar(50) COMMENT '抓拍照片'")
    @TableField("img_name")
    private String imgName;
}

 fzzy-igdss-core/src/main/java/com/fzzy/igds/domain/PatrolRecord.java

@@ -2,13 +2,10 @@

import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName;
import com.fasterxml.jackson.annotation.JsonFormat;
import lombok.Data;
import lombok.EqualsAndHashCode;

import javax.persistence.*;
import java.io.Serializable;
import java.util.Date;

/**
 * @Description ç”µå­å·¡é€»
@@ -51,19 +48,10 @@
    private String latitude;

    /**
     * --------鸟瞰图信息--------
     * --------巡更照片路径名称--------
     **/
    @Column(name = "img_id", columnDefinition = "varchar(50) COMMENT '巡更照片'")
    @TableField("img_id")
    private String imgId;

    @Column(name = "file_name", columnDefinition = "varchar(50) COMMENT '巡更照片'")
    @TableField("file_name")
    @Column(name = "img_name", columnDefinition = "varchar(50) COMMENT '抓拍照片'")
    @TableField("img_name")
    private String imgName;

    //巡更照片全路径
    @Transient
    @TableField(exist = false)
    private String imgPath;

}

 fzzy-igdss-core/src/main/java/com/fzzy/igds/domain/SnapRecord.java

@@ -56,22 +56,8 @@
    /**
     * --------抓图路径名称--------
     **/
    @Column(name = "file_name", columnDefinition = "varchar(50) COMMENT '抓拍照片'")
    @TableField("file_name")
    @Column(name = "img_name", columnDefinition = "varchar(50) COMMENT '抓拍照片'")
    @TableField("img_name")
    private String imgName;

    //巡更照片全路径
    @Transient
    @TableField(exist = false)
    private String imgPath;
    public SnapRecord() {
    }

    public SnapRecord(String tag) {
        if ("TEST".equals(tag)) {
            this.id = "TEST";
            this.imgPath = "/img/web/security/img-fail.jpg";
            this.snapTime = new Date();
        }
    }
}

 fzzy-igdss-view/src/main/java/com/fzzy/igds/Company.view.xml

@@ -465,7 +465,7 @@
            <Editor/>
          </AutoFormElement>
          <Link>
            <Property name="href">http://api.map.baidu.com/lbsapi/getpoint/</Property>
            <Property name="href">https://lbs.amap.com/tools/picker</Property>
            <Property name="target">_blank</Property>
            <Property name="style">
              <Property name="padding-left">150px</Property>

 fzzy-igdss-view/src/main/java/com/fzzy/igds/Dept.view.xml

@@ -182,6 +182,10 @@
        </DataColumn>
        <DataColumn name="kqmc">
          <Property name="property">kqmc</Property>
          <Property name="align">left</Property>
        </DataColumn>
        <DataColumn name="xzqhmc">
          <Property name="property">xzqhmc</Property>
          <Property name="align">center</Property>
        </DataColumn>
        <DataColumn name="kqcq">
@@ -360,7 +364,7 @@
            </Button>
          </Container>
          <Link>
            <Property name="href">http://api.map.baidu.com/lbsapi/getpoint/</Property>
            <Property name="href">https://lbs.amap.com/tools/picker</Property>
            <Property name="target">_blank</Property>
            <Property name="style">
              <Property name="padding-left">150px</Property>

 fzzy-igdss-web/src/main/java/com/fzzy/sys/controller/security/SecurityController.java

@@ -6,8 +6,6 @@
import com.fzzy.igds.constant.Constant;
import com.fzzy.igds.data.PageResponse;
import com.fzzy.igds.domain.Camera;
import com.fzzy.igds.domain.Dept;
import com.fzzy.igds.service.CoreDeptService;
import com.fzzy.igds.utils.ContextUtil;
import com.fzzy.igds.utils.SystemUtil;
import com.fzzy.sys.manager.common.CommonManager;
@@ -42,11 +40,12 @@
    private SecManager secManager;
    @Resource
    private CommonManager commonManager;
    @Resource
    private CoreDeptService deptService;

    /*------------------安防管理------------------*/

    /**
     * åº“区安防页面
     *
     * @param type    1.表示2.5D鸟瞰图页面预览；2.表示列表预览页面
     * @param deptId
     * @param view
@@ -191,6 +190,7 @@
    }


    /*------------------数量检测------------------*/

    /**
     * é¦–页总览

 fzzy-igdss-web/src/main/java/com/fzzy/sys/manager/security/SecManager.java

@@ -11,7 +11,6 @@
import com.ruoyi.common.utils.StringUtils;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Component;

import javax.annotation.Resource;
import java.util.List;


 fzzy-igdss-web/src/main/resources/static/ruoyi/css/ry-ui.css

@@ -662,7 +662,7 @@

.select-list li p, .select-list li label:not(.radio-box){
    float: left;
    width: 65px;
    width: 80px;
    margin: 5px 0px 0px 0px;
    text-align:right;
}

 fzzy-igdss-web/src/main/resources/static/security/patrol/patrolRecord-style.css

@@ -41,8 +41,8 @@
}
/* å•ä¸ªè½¨è¿¹å¡ç‰‡ */
.track-card {
    padding: 12px;
    border: 1px solid #f0f0f0;
    padding: 6px;
    border: 1px solid #ccc;
    border-radius: 6px;
    margin-bottom: 10px;
    cursor: pointer;
@@ -71,6 +71,8 @@
    width: 80px;
    color: #666;
    flex-shrink: 0;
    line-height: 20px;
    font-size: 15px;
}
.card-row .value {
    color: #333;
@@ -78,6 +80,7 @@
    overflow: hidden;
    text-overflow: ellipsis;
    white-space: nowrap;
    margin-left: 10px;
}
/* æ»šåŠ¨æ¡ç¾ŽåŒ– */
.track-card-panel::-webkit-scrollbar {

 fzzy-igdss-web/src/main/resources/static/security/patrol/patrolRecord.js

@@ -63,11 +63,9 @@
        // æ ‡è®°ç‚¹å¼¹çª—信息
        var infoWindow = new BMapGL.InfoWindow(`
                <div style="font-size: 12px; line-height: 1.8;">
                    <p><strong>点位名称：</strong>${record.pointName}</p>
                    <p><strong>巡检人：</strong>${record.createBy}</p>
                    <p><strong>巡检时间：</strong>${new Date(record.createTime).toLocaleString()}</p>
                    <p><strong>经纬度：</strong>${lat}, ${lng}</p>
                    <p><strong>轨迹点ID：</strong>${record.id}</p>
                </div>
            `);


 fzzy-igdss-web/src/main/resources/templates/security/eventInfo/eventInfo.html

@@ -18,10 +18,20 @@
                <div class="select-list">
                    <ul>
                        <li>
                            æ‰€å±žåº“区：<input type="text" name="deptId"/>
                            æ”¶å‚¨å…¬å¸ï¼š<select name="companyId">
                            <option value="all">所有</option>
                        </select>
                        </li>
                        <li>
                            æ‰€å±žä»“库：<input type="text" name="depotId"/>
                            æ‰€é€‰åº“区：<select name="deptId">
                            <option value="">所有</option>
                        </select>
                        </li>
                        <li class="select-time">
                            <label>事件时间： </label>
                            <input type="text" class="time-input" style="width: 120px;" id="start" placeholder="开始时间" name="params[begin]"/>
                            <span>-</span>
                            <input type="text" class="time-input" style="width: 120px;" id="end" placeholder="结束时间" name="params[end]"/>
                        </li>
                        <li>
                            <a class="btn btn-primary btn-rounded btn-sm" onclick="searchRecord()"><i
@@ -39,7 +49,7 @@
            </div>
        </div>

        <div class="col-sm-12 " style="padding-top: 10px;">
        <div class="col-sm-12 " style="padding-top: 10px;background: #FFFFFF;margin-top: 10px;">
            <!-- äº‹ä»¶ç½‘æ ¼ -->
            <div class="gallery-grid" id="gallery-container">
                <!-- äº‹ä»¶ä¸ºç©ºæ—¶æ˜¾ç¤º -->

 fzzy-igdss-web/src/main/resources/templates/security/patrol/patrolRecord/patrolRecord.html

@@ -22,29 +22,16 @@
            </div>
            <!-- è½¨è¿¹å¡ç‰‡åˆ—表（Thymeleaf循环渲染） -->
            <div th:each="record,stat : ${patrolRecordList}" class="track-card" data-index="${stat.index}">
                <div class="card-row">
                    <span class="label">序号：</span>
                    <span class="value" th:text="${stat.index + 1}"></span>
                <div style="margin-bottom: 10px">
                    <img style="width: 100%" th:src="${record.imgName ?: '/logo-sm.png'}" th:data-id="${record.id}">
                </div>
                <div class="card-row">
                    <span class="label">点位名称：</span>
                    <span class="value" th:text="${record.pointName}"></span>
                </div>
                <div class="card-row">
                    <span class="label">巡检人：</span>
                    <span class="label">å·¡&nbsp;&nbsp;检&nbsp;&nbsp;人：</span>
                    <span class="value" th:text="${record.createBy}"></span>
                </div>
                <div class="card-row">
                    <span class="label">巡检时间：</span>
                    <span class="value" th:text="${#dates.format(record.createTime, 'yyyy-MM-dd HH:mm:ss')}"></span>
                </div>
                <div class="card-row">
                    <span class="label">经纬度：</span>
                    <span class="value" th:text="${record.latitude} + ', ' + ${record.longitude}"></span>
                </div>
                <div class="card-row">
                    <span class="label">轨迹点ID：</span>
                    <span class="value" th:text="${record.id}"></span>
                </div>
            </div>
        </div>

 fzzy-igdss-web/src/main/resources/templates/security/snap/snapConf/add.html

ÎļþÒÑɾ³ý

 fzzy-igdss-web/src/main/resources/templates/security/snap/snapConf/edit.html

ÎļþÒÑɾ³ý

 fzzy-igdss-web/src/main/resources/templates/security/snap/snapConf/snapConf.html

ÎļþÒÑɾ³ý