Merge remote-tracking branch 'origin/master'

Hos-Resource-Rest/pom.xml

@@ -45,10 +45,10 @@
            <artifactId>spring-data-mongodb</artifactId>
        </dependency>
        <dependency>
        <groupId>org.mongodb</groupId>
        <artifactId>mongo-java-driver</artifactId>
        <version>3.1.0</version>
    </dependency>
            <groupId>org.mongodb</groupId>
            <artifactId>mongo-java-driver</artifactId>
            <version>3.1.0</version>
        </dependency>
        <dependency>
            <groupId>commons-dbutils</groupId>
            <artifactId>commons-dbutils</artifactId>
@@ -155,6 +155,11 @@
            <version>2.1.2</version>
        </dependency>
        <!--===================swagger end==================-->
        <dependency>
            <groupId>com.yihu.core</groupId>
            <artifactId>core-rpc</artifactId>
            <version>2.0.0</version>
        </dependency>
    </dependencies>

Hos-resource/src/main/webapp/WEB-INF/ehr/jsp/resource/resourcerest/resourceRestJs.jsp

@@ -12,8 +12,6 @@
        $dictGrid: $("#dict_grid"),//字典datagrid
        $dictItemGrid: $("#dictItem_grid"),//字典datagrid
        $dialog:null,
        grid:null,
        grid1:null,
        init: function () {
            this.initLayout();
            this.initButton();
@@ -21,6 +19,7 @@
        },
        initLayout: function () {
            this.$layout.ligerLayout({
                height:"98%",
                leftWidth: 370,
                isLeftCollapse: false,//左边区域初始化不可以隐藏
                allowLeftCollapse: false//左边区域不可以隐藏
@@ -34,20 +33,25 @@
        },
        initButton: function () {
            $("#dictname").ligerSearch({
            resourceRest.$dictname.ligerSearch({
                width: 200,onClick: function (value) {
                    resourceRest.grid.set({
                    resourceRest.$dictGrid.set({
                        parms: {categoryId: $("#dictname").val()}
                    });
                    resourceRest.grid.reload();
                    resourceRest.grid.changePage("first");
                    resourceRest.$dictGrid.reload();
                    resourceRest.$dictGrid.changePage("first");
                }
            });
            this.$dictItemName.ligerSearch({
            resourceRest.$dictItemName.ligerSearch({
                width: 200,onClick: function (value) {
                    var selectRow=resourceRest.$dictGrid.getSelectedRow();
                    var param={resourceRestName: $("#dictItemName").val()};
                    if(selectRow){
                        param.resourceRestId=selectRow.id;
                    }
                    resourceRest.$dictItemGrid.set({
                        parms: {resourceRestId: $("#dictItemName").val()}
                        parms: param
                    });
                    resourceRest.$dictItemGrid.reload();
                    resourceRest.$dictItemGrid.changePage("first");
@@ -163,7 +167,7 @@
            this.$dialog.close();
        },
        initGrid: function () {
            this.grid=$("#dict_grid").ligerGrid({
            this.$dictGrid=this.$dictGrid.ligerGrid({
                url: '${contextRoot}/resourceRest/getResourceRestList',
                columns: [
                    {display: '业务资源名称', name: 'name', width: '25%'},
@@ -178,6 +182,12 @@
                    }
                    }
                ],
                alternatingRow: false,
                checkbox: false,
                heightDiff: -10,
                headerRowHeight: 40,
                height:"96%",
                rowHeight: 40,
                onDblClickRow:function(data,rowid,rowdata) {
                    resourceRest.editorResourceRestDialog(data.id);
                },
@@ -201,9 +211,15 @@
                    }
                    }
                ],
                alternatingRow: false,
                checkbox: false,
                height:"96%",
                heightDiff: -10,
                onDblClickRow:function(data,rowid,rowdata) {
                    resourceRest.editorResourceRestDetailDialog(data.id);
                }
                },
                headerRowHeight: 40,
                rowHeight: 40,
            });
        },
    };