Merge branch 'master' of http://192.168.1.220:10080/esb/esb

src/main/webapp/WEB-INF/ehr/jsp/system/app/appDetail.jsp

@@ -26,7 +26,7 @@
        <label><span class="red">*&nbsp;</span>图标：</label>
        <div class="m-form-control">
                <img src="${model.icon}" style="width: 50px; height: 50px;"   name="icon">
                <img src="${contextRoot}/${model.icon}" style="width: 50px; height: 50px;"   name="icon">
        </div>
    </div>
    <div class="m-form-group">

src/main/webapp/WEB-INF/ehr/jsp/system/app/appJs.jsp

@@ -35,7 +35,7 @@
                    {display: '应用名称', id: 'id', name: 'name', width: '15%'},
                    {display: '英文名', name: 'code', width: '10%'},
                    {display: '图标', name: 'icon', width: '10%',height:'50',align: 'center', render: function (rowdata, rowindex, value) {
                        return ' <div style="vertical-align:middle;"><img  style="width: 50px; height: 50px;"  src="'+rowdata.icon+'" /></div>';
                        return ' <div style="vertical-align:middle;"><img  style="width: 50px; height: 50px;"  src="${contextRoot}/'+ rowdata.icon+'" /></div>';
                    }},
                    {display: '开发者', name: 'developer', width: '10%'},
                    {display: '状态', name: 'status', width: '10%',align: 'center', render: function (rowdata, rowindex, value) {
@@ -52,7 +52,7 @@
                        var html = '<div class="m-inline-buttons" style="width:350px;">';
                        html += "<a class=\"m-btn\" style=\"padding-right:10px\" onclick=\"app.dialogDetail('"+row.id+"')\">查看详情</a>";
                        html += "<a class=\"m-btn\" style=\"padding-right:10px\" onclick=\"app.appServiceManage('"+row.id+"')\">服务管理</a>";
                        html += "<a class=\"m-btn\"  onclick=\"app.dialogDetail('"+row.id+"')\">应用标准</a>";
//                        html += "<a class=\"m-btn\"  onclick=\"app.dialogDetail('"+row.id+"')\">应用标准</a>";
                        html += "<a class=\"m-btn-edit\" onclick=\"app.editorDialog('"+row.id+"')\"></a>";
                        html += "<a class=\"m-btn-delete\" onclick=\"app.delete('"+row.id+"')\"></a>";
                        html += '</div>';

src/main/webapp/WEB-INF/ehr/jsp/system/app/editorApp.jsp

@@ -27,7 +27,7 @@
        <label><span class="red">*&nbsp;</span>图标：</label>
        <div class="m-form-control">
            <c:if test="${model.icon!=''}">
                <img style="width: 60px;" src="${model.icon}" id="img_icon">
                <img style="width: 60px;" src="${contextRoot}/${model.icon}" id="img_icon">
            </c:if>
        </div>
    </div>