Merge branch 'master' of ssh://117.78.1.188:29418/dkyChenJiang

zmk

2024-05-18 6662074ac2366a1068f54cefb1e46af7fca4fc81

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

@@ -44,12 +44,7 @@
                <a class="btn btn-danger multiple disabled" onclick="$.operate.removeAll()" shiro:hasPermission="geo:projectData:remove">
                    <i class="fa fa-remove"></i> 删除
                </a>
<!--                <a class="btn btn-warning" onclick="$.table.exportExcel()" shiro:hasPermission="geo:projectData:export">-->
<!--                    <i class="fa fa-download"></i> 导出-->
<!--                 </a>-->
                <a class="btn btn-danger" data-toggle="modal" onclick="uploadZIP();">
                    <i class="fa fa-upload"></i>上传附件
                </a>

            </div>
            <div class="col-sm-12 select-table table-striped">
                <table id="bootstrap-table"></table>
@@ -79,27 +74,27 @@
                    checkbox: true
                },
                {
                    field : 'id', 
                    field : 'id',
                    title : '主键',
                    visible: false
                },
                {
                    field : 'name', 
                    field : 'name',
                    title : '资料名称'
                },
                {
                    field : 'fileType', 
                    field : 'fileType',
                    title : '业务类型',
                    formatter: function(value, row, index) {
                       return $.table.selectDictLabel(fileTypeDatas, value);
                    }
                },
                {
                    field : 'labels', 
                    field : 'labels',
                    title : '标签'
                },
                {
                    field : 'remark', 
                    field : 'remark',
                    title : '备注'
                },
                {
@@ -109,7 +104,9 @@
                        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="viewImg(\'' + row.dataUrl + '\' , \'' + row.id + '\')"><i class="glyphicon glyphicon-menu-hamburger"></i>查看附件</a>');
                        actions.push('<a class="btn btn-info btn-xs ' + removeFlag + '" href="javascript:void(0)" onclick="uploadZIP(\'' + row.id + '\')"><i class="fa fa-upload"></i>上传</a> ');
                        actions.push('<a class="btn btn-info btn-xs ' + '" href="javascript:void(0)" onclick="viewResource(\'' + row.id + '\' , \'' + row.id + '\')"><i class="glyphicon glyphicon-menu-hamburger"></i>查看附件</a>');

                        return actions.join('');
                    }
                }]
@@ -118,20 +115,16 @@
        });

        // 上传附件
        function uploadZIP(){
            $.modal.open('上传附件', prefix + "/importImg");
        function uploadZIP(id){
            $.modal.open('上传附件', prefix + "/importImg?projectDataId="+id);
        }


        // 查看图片详情
        function viewImg(path, id) {
            if(path === null || path === '' || path === 'null'){
                $.modal.alertSuccess("文件无法打开！");
                return;
            }
            var url = prefix + "/viewImage?id=" + id;
            $.modal.open("查看图片", url, 800, 600);
        //查看资料
        function viewResource(id){
            $.modal.open("资料列表",  prefix + "/projectDataFileList?id=" + id, 800, 600);
        }

    </script>
</body>
</html>