Merge branch 'master' of http://117.78.1.188:8089/r/dkyChenJiang

chenhuan

2024-05-20 c6f79f5720c5d4a700b8b759a93393559409fd1c

 javaweb-plus/javaweb-cms/src/main/resources/templates/geo/projectCamera/projectCamera.html

@@ -11,24 +11,12 @@
                    <div class="select-list">
                        <ul>
                            <li>
                                <p>项目id：</p>
                                <input type="text" name="projectId"/>
                            </li>
                            <li>
                                <p>名称：</p>
                                <input type="text" name="name"/>
                            </li>
                            <li>
                                <p>视频编号：</p>
                                <input type="text" name="code"/>
                            </li>
                            <li>
                                <p>经度：</p>
                                <input type="text" name="lng"/>
                            </li>
                            <li>
                                <p>纬度：</p>
                                <input type="text" name="lat"/>
                            </li>
                            <li>
                                <p>Ip地址：</p>
@@ -53,9 +41,9 @@
                <a class="btn btn-danger multiple disabled" onclick="$.operate.removeAll()" shiro:hasPermission="geo:projectCamera:remove">
                    <i class="fa fa-remove"></i> 删除
                </a>
                <a class="btn btn-warning" onclick="$.table.exportExcel()" shiro:hasPermission="geo:projectCamera:export">
                    <i class="fa fa-download"></i> 导出
                 </a>
<!--                <a class="btn btn-warning" onclick="$.table.exportExcel()" shiro:hasPermission="geo:projectCamera:export">-->
<!--                    <i class="fa fa-download"></i> 导出-->
<!--                </a>-->
            </div>
            <div class="col-sm-12 select-table table-striped">
                <table id="bootstrap-table"></table>
@@ -111,12 +99,17 @@
                        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-info btn-xs ' + '" href="javascript:void(0)" onclick="player(\'' + row.id + '\')"><i class="fa fa-video-camera"></i>播放</a>');
                        return actions.join('');
                    }
                }]
            };
            $.table.init(options);
        });

        function  player(id) {
            $.modal.open('视频播放', prefix + "/player?id="+id);
        }
    </script>
</body>
</html>