Merge remote-tracking branch 'origin/master'

czt

4 天以前 b1e6bf7d3ed1a1d64182127f83fdc3fad2233a7e

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

@@ -12,7 +12,10 @@
                <div class="select-list">
                    <ul>
                        <li>
                            名称：<input type="text" name="name"/>
                            巡逻人：<input type="text" name="userName"/>
                        </li>
                        <li>
                            班次名称：<input type="text" name="confName"/>
                        </li>
                        <li>
                            <a class="btn btn-primary btn-rounded btn-sm" onclick="$.table.search()"><i class="fa fa-search"></i>&nbsp;搜索</a>
@@ -24,19 +27,19 @@
        </div>

        <div class="btn-group-sm" id="toolbar" role="group">
            <a class="btn btn-success" onclick="$.operate.add()" shiro:hasPermission="web:security:patrol:add">
                <i class="fa fa-plus"></i> 新增
            </a>
            <a class="btn btn-primary single disabled" onclick="$.operate.edit()" shiro:hasPermission="web:security:patrol:edit">
                <i class="fa fa-edit"></i> 修改
            </a>
            <a class="btn btn-danger multiple disabled" onclick="$.operate.removeAll()" shiro:hasPermission="web:security:patrol:remove">
                <i class="fa fa-remove"></i> 删除
            </a>
            <a class="btn btn-warning" onclick="$.table.exportExcel()" shiro:hasPermission="web:security:patrol:export">
                <i class="fa fa-download"></i> 导出
            </a>
            <a class="btn btn-success" onclick="openPatrolConf()" shiro:hasPermission="web:security:patrol:patrolConf:edit">
<!--            <a class="btn btn-success" onclick="$.operate.add()" >-->
<!--                <i class="fa fa-plus"></i> 新增-->
<!--            </a>-->
<!--            <a class="btn btn-primary single disabled" onclick="$.operate.edit()" >-->
<!--                <i class="fa fa-edit"></i> 修改-->
<!--            </a>-->
<!--            <a class="btn btn-danger multiple disabled" onclick="$.operate.removeAll()" >-->
<!--                <i class="fa fa-remove"></i> 删除-->
<!--            </a>-->
<!--            <a class="btn btn-warning" onclick="$.table.exportExcel()" >-->
<!--                <i class="fa fa-download"></i> 导出-->
<!--            </a>-->
            <a class="btn btn-success" onclick="openPatrolConf()" >
                <i class="fa fa-plus"></i> 巡更配置
            </a>
        </div>
@@ -48,10 +51,8 @@
<th:block th:include="include :: footer" />
<th:block th:include="include :: select2-js" />
<script th:inline="javascript">
    var editFlag = [[${@permission.hasPermi('web:security:patrol:edit')}]];
    var removeFlag = [[${@permission.hasPermi('web:security:patrol:remove')}]];
    var prefix = ctx + "security/patrol";

    var deptList = [[${deptList}]];
    $(function() {

        var options = {
@@ -63,6 +64,10 @@
            sortName: "id",
            sortOrder: "asc",
            modalName: "参数",
            showSearch:false,
            showRefresh:false,
            showColumns:false,
            showToggle:false,
            columns: [{
                checkbox: true
            },
@@ -75,13 +80,21 @@
                    field: 'deptId',
                    title: '所属库区',
                    align: 'left',
                    // formatter: function(value, row, index) {
                    //     return $.table.tooltip(value);
                    // }
                    //根据deptList回显诗句
                    formatter: function(value, row, index) {
                        var deptName = '';
                        deptList.forEach(function (item) {
                            if (item.id == value) {
                                deptName = item.kqmc;
                            }
                        })
                        return $.table.tooltip(deptName);
                    }

                },
                {
                    field: 'batchId',
                    title: '班次编号',
                    field: 'confName',
                    title: '班次名称',
                    align: 'left',
                    // formatter: function(value, row, index) {
                    //     return $.table.tooltip(value);
@@ -99,8 +112,9 @@
                    align: 'center',
                    formatter: function(value, row, index) {
                        var actions = [];
                        actions.push('<a class="btn btn-success btn-xs ' + editFlag + '" href="javascript:void(0)" onclick="$.operate.edit(\'' + row.id + '\')"><i class="fa fa-edit"></i>编辑</a> ');
                        actions.push('<a class="btn btn-danger btn-xs ' + removeFlag + '" href="javascript:void(0)" onclick="$.operate.remove(\'' + row.id + '\')"><i class="fa fa-remove"></i>删除</a>');
                        // actions.push('<a class="btn btn-success btn-xs '  + '" href="javascript:void(0)" onclick="$.operate.edit(\'' + row.id + '\')"><i class="fa fa-edit"></i>编辑</a> ');
                        // actions.push('<a class="btn btn-danger btn-xs '  + '" href="javascript:void(0)" onclick="$.operate.remove(\'' + row.id + '\')"><i class="fa fa-remove"></i>删除</a>');
                        actions.push('<a class="btn btn-info btn-xs '  + '" href="javascript:void(0)" onclick="patrolDetail(\'' + row.id + '\')"><i class="fa fa-list-ul"></i>详情</a> ');
                        return actions.join('');
                    }
                }]
@@ -108,6 +122,12 @@
        $.table.init(options);
    });

    /*详情*/
    function patrolDetail(patrolId) {
        var url = prefix + '/patrolRecord/' + patrolId;
        $.modal.openTab("巡更详情", url);
    }

    function openPatrolConf() {
        var url = ctx + "security/patrol/patrolConf";
        $.modal.openTab("巡更配置", url);