Index: ssts-web/src/main/webapp/dx-disinfectsystem/css/reviewView/reviewView.css =================================================================== diff -u -r24983 -r25031 --- ssts-web/src/main/webapp/dx-disinfectsystem/css/reviewView/reviewView.css (.../reviewView.css) (revision 24983) +++ ssts-web/src/main/webapp/dx-disinfectsystem/css/reviewView/reviewView.css (.../reviewView.css) (revision 25031) @@ -71,6 +71,7 @@ /**********公用***********************/ *{font-size:12px;} + .modal-header { background-color: #23b051; color: white; @@ -85,9 +86,30 @@ margin-right: auto; } -/* .fixed-table-pagination{ - position: fixed; - bottom: 0; - left: 0; - width: 100%; -} */ \ No newline at end of file +/*导航栏样式*/ +.navigation-review{ + margin-bottom: 0 !important; +} +.navigation-review li{ + height:30px; +} +.navigation-review li.active{ + height:30px; +} +.navigation-review li a{ + color:#669933; + font-size: 14px; + height:30px; + line-height: 13px; + font-size:15px; +} +/* .assembly-manage li.active a{ +} */ +.navigation-review li a:hover{ + background: none; + border:1px solid #C6E3CA; +} +/**鼠标 移动行变色**/ +.onMouseEnter-css{ + background-color:#f1eaea; +} \ No newline at end of file Index: ssts-web/src/main/webapp/dx-disinfectsystem/js/reviewView/reviewView.js =================================================================== diff -u -r24983 -r25031 --- ssts-web/src/main/webapp/dx-disinfectsystem/js/reviewView/reviewView.js (.../reviewView.js) (revision 24983) +++ ssts-web/src/main/webapp/dx-disinfectsystem/js/reviewView/reviewView.js (.../reviewView.js) (revision 25031) @@ -1081,7 +1081,7 @@ //创建unReviewTousseGrid unReviewTousseGrid = renderGrid("unReviewTousseGridId",unReviewTousseGridColums, "", checkboxSelector); //调整列宽高度 - attachAutoResizeDataGrid(unReviewTousseGrid, 'unReviewTousseGridId', 'unReviewToussegridContainer',115); + attachAutoResizeDataGrid(unReviewTousseGrid, 'unReviewTousseGridId', 'unReviewToussegridContainer',120); //加载数据并分页 renderGridDateAndPage(unReviewTousseGrid, 'unReviewGridPager', WWWROOT + "/disinfectSystem/packingReviewController/findUnReviewedTousseInstanceList.mhtml", { @@ -1192,7 +1192,7 @@ }); forReviewGrid = new Slick.Grid("#forReviewGridId", forReviewGridDataView, forReviewGridColumns, forReviewGridOptions); //调整列宽高度 - attachAutoResizeDataGrid(forReviewGrid, 'forReviewGridId', 'forReviewGridContainer',90); + attachAutoResizeDataGrid(forReviewGrid, 'forReviewGridId', 'forReviewGridContainer',95); //当行数改变时触发 forReviewGridDataView.onRowCountChanged.subscribe(function (e, args) { forReviewGrid.updateRowCount(); @@ -1295,7 +1295,7 @@ enableCellNavigation: true, enableColumnReorder: false, rowHeight: 35, - fullWidthRows:'true', + fullWidthRows:'true' // editable: false, // autoEdit: false, // enableAddRow: false, @@ -1310,10 +1310,26 @@ grid = new Slick.Grid("#" + gridId, dataView, columns, options); if (!isUndefinedOrNullOrEmpty(checkboxSelector)) { grid.registerPlugin(checkboxSelector); + grid.setSelectionModel(new Slick.RowSelectionModel({ + selectActiveRow: false //单选 + })); } - grid.setSelectionModel(new Slick.RowSelectionModel({ - selectActiveRow: false //单选 - })); + //鼠标 变色 + grid.onMouseEnter.subscribe(function (e,args){ + var rowAndCellByEvent = grid.getCellFromEvent(e);//根据事件返回触发的行和列下标：row,cell + var columns = grid.getColumns(); //列表每个列的定义 + var cssRow = {}; //用于修改行样式 + var changeRow = {}; + for (var i = 0; i < columns.length; i++) { + var column = columns[i]; + changeRow[column.id] = "onMouseEnter-css";//设置定义的css + } + cssRow[rowAndCellByEvent.row] = changeRow; + grid.setCellCssStyles("onMouseEnterCss", cssRow); + }) + grid.onMouseLeave.subscribe(function (e, args){ + grid.removeCellCssStyles("onMouseEnterCss"); + }) return grid; }; @@ -1424,7 +1440,6 @@ /** * - * * @returns */ function getforReviewGridDatas() { Index: ssts-web/src/main/webapp/dx-disinfectsystem/pages/disinfectsystem/review/reviewView.jsp =================================================================== diff -u -r24983 -r25031 --- ssts-web/src/main/webapp/dx-disinfectsystem/pages/disinfectsystem/review/reviewView.jsp (.../reviewView.jsp) (revision 24983) +++ ssts-web/src/main/webapp/dx-disinfectsystem/pages/disinfectsystem/review/reviewView.jsp (.../reviewView.jsp) (revision 25031) @@ -15,15 +15,12 @@ - - - - + - + @@ -42,7 +39,7 @@
-