diff --git a/04.系统编码/.vs/BeijingSafeguard/v15/.suo b/04.系统编码/.vs/BeijingSafeguard/v15/.suo index bce9250..bd29354 100644 Binary files a/04.系统编码/.vs/BeijingSafeguard/v15/.suo and b/04.系统编码/.vs/BeijingSafeguard/v15/.suo differ diff --git a/04.系统编码/App/Content/scripts/system-management/config-management/index.js b/04.系统编码/App/Content/scripts/system-management/config-management/index.js index 014254d..f9f1a6e 100644 --- a/04.系统编码/App/Content/scripts/system-management/config-management/index.js +++ b/04.系统编码/App/Content/scripts/system-management/config-management/index.js @@ -35,9 +35,9 @@ this.InitDataGrid = function () { $('#task-grid').datagrid({ columns: [[ - { field: 'Name', title: '名称', align: 'center', width: 100, formatter: this.formatIcon.bind(this) }, - { field: 'Value', title: '值', align: 'center', width: 100, formatter: this.formatIcon.bind(this) }, - { field: 'Unit', title: '单位', align: 'center', width: 30, formatter: this.formatIcon.bind(this) } + { field: 'Name', title: '名称', align: 'center', width: 10, formatter: this.formatIcon.bind(this) }, + { field: 'Value', title: '值', align: 'center', width: 10, formatter: this.formatIcon.bind(this) }, + { field: 'Unit', title: '单位', align: 'left', width: 70, formatter: this.formatIcon.bind(this) } ]], striped: true, singleSelect: false, diff --git a/04.系统编码/App/Content/scripts/system-management/org-management/index.js b/04.系统编码/App/Content/scripts/system-management/org-management/index.js index ce53216..b3073c9 100644 --- a/04.系统编码/App/Content/scripts/system-management/org-management/index.js +++ b/04.系统编码/App/Content/scripts/system-management/org-management/index.js @@ -74,9 +74,9 @@ this.InitDataGrid = function () { $('#task-grid').datagrid({ columns: [[ - { field: 'OrgName', title: '名称', align: 'center', width: 100 }, - { field: 'CreateTime', title: '创建时间', align: 'center', width: 100 }, - { field: 'isEnable', title: '启用', align: 'center', width: 30, formatter: this.formatText.bind(this) } + { field: 'OrgName', title: '名称', align: 'center', width: 10 }, + { field: 'CreateTime', title: '创建时间', align: 'center', width: 15 }, + { field: 'isEnable', title: '启用', align: 'left', width: 70, formatter: this.formatText.bind(this) } ]], striped: true, singleSelect: false, diff --git a/04.系统编码/App/Content/scripts/system-management/user-management/index.js b/04.系统编码/App/Content/scripts/system-management/user-management/index.js index 4958b19..661420e 100644 --- a/04.系统编码/App/Content/scripts/system-management/user-management/index.js +++ b/04.系统编码/App/Content/scripts/system-management/user-management/index.js @@ -74,12 +74,12 @@ this.InitDataGrid = function () { $('#task-grid').datagrid({ columns: [[ - { field: 'Name', title: '姓名', align: 'center', width: 50 }, - { field: 'LoginAccount', title: '登录账户', align: 'center', width: 50 }, - { field: 'LoginPassword', title: '登录密码', align: 'center', width: 50 }, - { field: 'LoginNumber', title: '登录次数', align: 'center', width: 50 }, - { field: 'LoginTime', title: '最后登录时间', align: 'center', width: 50 }, - { field: 'isEnable', title: '启用', align: 'center', width: 50, formatter: this.formatText.bind(this) } + { field: 'Name', title: '姓名', align: 'center', width: 10 }, + { field: 'LoginAccount', title: '登录账户', align: 'center', width: 10 }, + { field: 'LoginPassword', title: '登录密码', align: 'center', width: 10 }, + { field: 'LoginNumber', title: '登录次数', align: 'center', width: 10 }, + { field: 'LoginTime', title: '最后登录时间', align: 'center', width: 20 }, + { field: 'isEnable', title: '启用', align: 'left', width: 50, formatter: this.formatText.bind(this) } ]], striped: true, singleSelect: false, diff --git a/04.系统编码/App/Content/styles/common.css b/04.系统编码/App/Content/styles/common.css index 1176134..a75b22d 100644 --- a/04.系统编码/App/Content/styles/common.css +++ b/04.系统编码/App/Content/styles/common.css @@ -211,6 +211,24 @@ background-color: #f9f9f9 } +.manage-table .datagrid-header td:last-of-type .datagrid-cell, +.manage-table .datagrid-body .datagrid-row td:last-of-type .datagrid-cell { + padding-left: 15px; + position: relative; + overflow: visible; +} + +.manage-table .datagrid-header td:last-of-type .datagrid-cell:after, +.manage-table .datagrid-body .datagrid-row td:last-of-type .datagrid-cell:after { + content: ''; + width: 1px; + height: 28px; + position: absolute; + top: -6px; + left: 70px; + background-color: #dddddd +} + .manage-table .datagrid-body .datagrid-row:last-of-type td { border-bottom: 1px solid #dddddd; }