Merge remote-tracking branch 'origin/master'

puzhibing

2023-07-27 614b0106f079e67bb674a37ede2bd0fe3df2a430

 cloud-server-management/src/main/webapp/WEB-INF/view/system/role/role.html

@@ -2,8 +2,6 @@
<div class="row">
    <div class="col-sm-12">
        <div class="ibox float-e-margins">
            <input hidden id="language" value="${language}">
            @if(language==1){
            <div class="ibox-title">
                <h5>角色管理</h5>
            </div>
@@ -28,59 +26,6 @@
                    </div>
                </div>
            </div>
            @}
            @if(language==2){
            <div class="ibox-title">
                <h5>Role management</h5>
            </div>
            <div class="ibox-content">
                <div class="row row-lg">
                    <div class="col-sm-12">
                        <div class="row">
                            <div class="col-sm-3">
                                <#NameCon id="roleName" name="Role name" />
                            </div>
                            <div class="col-sm-3">
                                <#button name="Search" icon="fa-search" clickFun="Role.search()"/>
                            </div>
                        </div>
                        <div class="hidden-xs" id="roleTableToolbar" role="group">
                            <#button name="Add" icon="fa-plus" clickFun="Role.openAddRole()" />
                            <#button name="Update" icon="fa-edit" clickFun="Role.openChangeRole()" space="true"/>
                            <#button name="Delete" icon="fa-remove" clickFun="Role.delRole()" space="true"/>
                            <#button name="Permission configuration" icon="fa-user-secret" clickFun="Role.assign()" space="true"/>
                        </div>
                        <#table id="roleTable"/>
                    </div>
                </div>
            </div>
            @}
            @if(language==3){
            <div class="ibox-title">
                <h5>Manajemen peran</h5>
            </div>
            <div class="ibox-content">
                <div class="row row-lg">
                    <div class="col-sm-12">
                        <div class="row">
                            <div class="col-sm-3">
                                <#NameCon id="roleName" name="Peran" />
                            </div>
                            <div class="col-sm-3">
                                <#button name="Pencarian" icon="fa-search" clickFun="Role.search()"/>
                            </div>
                        </div>
                        <div class="hidden-xs" id="roleTableToolbar" role="group">
                            <#button name="Tambah" icon="fa-plus" clickFun="Role.openAddRole()" />
                            <#button name="Sunting" icon="fa-edit" clickFun="Role.openChangeRole()" space="true"/>
                            <#button name="Hapus" icon="fa-remove" clickFun="Role.delRole()" space="true"/>
                            <#button name="Konfigurasi izin" icon="fa-user-secret" clickFun="Role.assign()" space="true"/>
                        </div>
                        <#table id="roleTable"/>
                    </div>
                </div>
            </div>
            @}

        </div>
    </div>