From 634e8b71ab03fe30f32fe2aeaadaafaba27bd61b Mon Sep 17 00:00:00 2001 From: Tsanie Date: Mon, 5 Jun 2023 10:10:22 +0800 Subject: [PATCH] sync --- Site/Inspection/Report.aspx | 31 ++- Site/Inspection/ReportForWorkOrder.aspx | 82 +++++++- Site/Inspection/js/main.js | 2 +- .../js/modules/inspects/editinspection.js | 8 +- .../js/modules/inspects/editquestion.js | 22 +- Site/Inspection/js/modules/layouts.js | 2 +- Site/Inspection/js/report.js | 196 +++++++++++------- Site/Inspection/js/view-main.js | 2 +- Site/IronIntelMasterPage.master | 2 +- Site/Maintenance/WorkOrderMaintenance.aspx | 91 +++++++- Site/Maintenance/js/manageworkorder.js | 7 +- Site/Maintenance/js/workordertabitems.js | 12 +- Site/Maintenance/js/workorderwidgets.js | 31 ++- Site/js/lib/app.min.js | 12 +- Site/js/lib/app.min.js.map | 2 +- Site/js/lib/ui.min.css | 2 +- Site/js/lib/ui.min.js | 4 +- Site/js/lib/ui.min.js.map | 2 +- 18 files changed, 367 insertions(+), 143 deletions(-) diff --git a/Site/Inspection/Report.aspx b/Site/Inspection/Report.aspx index a27c42f..89a4209 100644 --- a/Site/Inspection/Report.aspx +++ b/Site/Inspection/Report.aspx @@ -81,8 +81,8 @@ } .question { - min-height: 24px; - line-height: 24px; + /*min-height: 24px;*/ + /*line-height: 24px;*/ padding-left: 70px; padding-right: 10px; font-size: 14px; @@ -92,8 +92,8 @@ } .answer { - min-height: 24px; - line-height: 24px; + /*min-height: 24px;*/ + /*line-height: 24px;*/ padding-left: 90px; padding-right: 10px; } @@ -186,12 +186,19 @@ } } - .question_line { - border-collapse: collapse; + .question_line tr { border-top: 1px solid #dbdbdb; border-bottom: 1px solid #dbdbdb; } + .question_line { + border-collapse: collapse; + } + + .answer_line { + border-collapse: collapse; + } + .question_table_grid { border-collapse: collapse; } @@ -200,10 +207,20 @@ border: 1px solid #dbdbdb; } - .question_div_grid { + .question_standard_table_line { + border-top: 1px solid #dbdbdb; + border-bottom: 1px solid #dbdbdb; + } + + .question_standard_table_grid { border: 1px solid #dbdbdb; } + .answer_div_grid { + border-left: 1px solid #dbdbdb; + border-right: 1px solid #dbdbdb; + } + .mediacaption { text-align: center; clear: both; diff --git a/Site/Inspection/ReportForWorkOrder.aspx b/Site/Inspection/ReportForWorkOrder.aspx index b0ac4c3..58adef1 100644 --- a/Site/Inspection/ReportForWorkOrder.aspx +++ b/Site/Inspection/ReportForWorkOrder.aspx @@ -60,7 +60,7 @@ .page { /*background-color: #d3d3d3;*/ /*height: 52px;*/ - line-height: 52px; + line-height: 25px; margin-top: 8px; padding-left: 10px; padding-right: 10px; @@ -72,7 +72,7 @@ .section { /*background-color: #eaeaea;*/ /*height: 40px;*/ - line-height: 40px; + line-height: 20px; padding-left: 30px; padding-right: 10px; font-size: 20px; @@ -81,8 +81,8 @@ } .question { - min-height: 30px; - line-height: 30px; + min-height: 24px; + line-height: 24px; padding-left: 70px; padding-right: 10px; font-size: 14px; @@ -92,12 +92,21 @@ } .answer { - min-height: 30px; - line-height: 30px; + min-height: 24px; + line-height: 24px; padding-left: 90px; padding-right: 10px; } + .table_content { + padding-left: 3px; + padding-right: 3px; + } + + .pagedoublespace { + line-height: 50px; + } + .media { width: 120px; height: 120px; @@ -176,6 +185,50 @@ display: block; } } + + .question_line tr { + border-top: 1px solid #dbdbdb; + border-bottom: 1px solid #dbdbdb; + } + + .question_line { + border-collapse: collapse; + } + + .answer_line { + border-collapse: collapse; + } + + .question_table_grid { + border-collapse: collapse; + } + + .question_table_grid td { + border: 1px solid #dbdbdb; + } + + .question_standard_table_line { + border-top: 1px solid #dbdbdb; + border-bottom: 1px solid #dbdbdb; + } + + .question_standard_table_grid { + border: 1px solid #dbdbdb; + } + + .answer_div_grid { + border-left: 1px solid #dbdbdb; + border-right: 1px solid #dbdbdb; + } + + .mediacaption { + text-align: center; + clear: both; + height: 25px; + width: 120px; + overflow: hidden; + text-overflow: ellipsis; + } @@ -249,6 +302,19 @@ Print
+
+ + + + + + +
+ + + +
+

{{report.Template.Name}}

{{report.CommitTimeLocalStr}} by {{report.CommitedByUserName}}
@@ -361,7 +427,9 @@
- + diff --git a/Site/Inspection/js/main.js b/Site/Inspection/js/main.js index bbed0a7..19a9ee5 100644 --- a/Site/Inspection/js/main.js +++ b/Site/Inspection/js/main.js @@ -5,7 +5,7 @@ require.config({ //spectrum: "../../js/spectrum" }, waitSeconds: 0, - urlArgs: "v=455" //+ Math.random() + urlArgs: "v=464" //+ Math.random() }) requirejs(['modules/pageloader'], function (loader) { diff --git a/Site/Inspection/js/modules/inspects/editinspection.js b/Site/Inspection/js/modules/inspects/editinspection.js index 565b4a1..91a407f 100644 --- a/Site/Inspection/js/modules/inspects/editinspection.js +++ b/Site/Inspection/js/modules/inspects/editinspection.js @@ -113,10 +113,10 @@ _this.loading && _this.loading.fadeOut(100); return; } - if (q.QuestionType === Question.types.AssetStatus) { - a.Result = a.Comment; - a.Comment = ""; - } + //if (q.QuestionType === Question.types.AssetStatus) { + // a.Result = a.Comment; + // a.Comment = ""; + //} answers.push(a); } diff --git a/Site/Inspection/js/modules/inspects/editquestion.js b/Site/Inspection/js/modules/inspects/editquestion.js index 1acb4fe..4494abb 100644 --- a/Site/Inspection/js/modules/inspects/editquestion.js +++ b/Site/Inspection/js/modules/inspects/editquestion.js @@ -852,15 +852,15 @@ content.append('
'); cnt = $('
'); - var divComment = $('
'); - var comment = $(''); - comment.attr('maxlength', 500); + var divResult = $('
'); + var rst = $(''); + rst.attr('maxlength', 500); if (answer && answer.Result) { - comment.val(answer.Result); + rst.val(answer.Result); } - this.ui.comment = comment; - divComment.append(comment); - cnt.append(divComment); + this.ui.assetstatusresult = rst; + divResult.append(rst); + cnt.append(divResult); content.append(cnt); return content; @@ -874,12 +874,8 @@ items.push(item); } answer.SelectedItems = items; - if (items.length > 0) { - answer.Result = items.map(function (i) { return i.Value || i.Text }).join('\n'); - //answer.SeverityLevel = items[0].SeverityLevel; - } else { - answer.Result = ''; - } + answer.Result = this.ui.assetstatusresult.val(); + return answer; }; assetStatusQuestion.prototype.focus = function () { diff --git a/Site/Inspection/js/modules/layouts.js b/Site/Inspection/js/modules/layouts.js index 32dc371..f2fe1d3 100644 --- a/Site/Inspection/js/modules/layouts.js +++ b/Site/Inspection/js/modules/layouts.js @@ -573,7 +573,7 @@ content.find('.layout-footers-middle .editor-content').val(info.PageFooterCenter); content.find('.layout-footers-right .editor-content').val(info.PageFooterRight); - content.find('#layout-style').val(info.Style); + content.find('#layout-style').val(info.Style).change(); content.find('#layout-spacing').val(info.Spacing); content.find('#layout-picturesdisplay').val(info.PicturesDisplay); content.find('#layout-captionimages').prop('checked', info.CaptionImages); diff --git a/Site/Inspection/js/report.js b/Site/Inspection/js/report.js index 1975ea6..2d0a1f4 100644 --- a/Site/Inspection/js/report.js +++ b/Site/Inspection/js/report.js @@ -158,7 +158,7 @@ function showIdentifiedQuestions(questions) { var content = $('
'); content.append($('
IDENTIFIED ISSUES
')); if (questions && questions.length > 0) { - createQuestionContent1(content, questions); + createQuestionContent1(content, questions, true); } else content.append($('
').text(GetTextByKey("P_IPT_NOQUESTIONS", 'No Questions'))); @@ -210,8 +210,7 @@ function showSignature(report) { else if (layoutDivider == 2)//Grid div_pic.addClass('question_div_grid'); - if (layoutSpacing == 1)//Double Space - div_pic.css('line-height', '30px'); + div_pic.css('line-height', layoutSpacing == 1 ? '32px' : '16px'); } } @@ -247,8 +246,7 @@ function showMedias() { else if (layoutDivider == 2)//Grid div_question.addClass('question_table_grid'); - if (layoutSpacing == 1)//Double Space - div_question.css('line-height', '30px'); + div_question.css('line-height', layoutSpacing == 1 ? '32px' : '16px'); } else if (layoutStyle == 2) {//Split var div_question = $('
'); @@ -279,8 +277,7 @@ function showMedias() { else if (layoutDivider == 2)//Grid div_question.addClass('question_table_grid'); - if (layoutSpacing == 1)//Double Space - div_question.css('line-height', '30px'); + div_question.css('line-height', layoutSpacing == 1 ? '32px' : '16px'); } else { var div_question = $('
'); @@ -297,14 +294,13 @@ function showMedias() { } if (layoutDivider == 1)//Line - div_question.addClass('question_line'); + div_question.addClass('question_standard_table_line'); else if (layoutDivider == 2)//Grid - div_question.addClass('question_table_grid'); + div_question.addClass('question_standard_table_grid'); if (layoutSpacing == 1)//Double Space - div_question.css('line-height', '30px'); + div_question.css('line-height', layoutSpacing == 1 ? '32px' : '16px'); } - $('#divpages').append(content); } @@ -355,8 +351,7 @@ function createPage(page) { else if (layoutDivider == 2)//Grid tabpage.addClass('question_table_grid'); - if (layoutSpacing == 1)//Double Space - tabpage.css('line-height', '30px'); + tabpage.css('line-height', layoutSpacing == 1 ? '32px' : '16px'); } else { var divpage = $('
'); @@ -404,8 +399,7 @@ function createSectionContent(page) { else if (layoutDivider == 2)//Grid tabsection.addClass('question_table_grid'); - if (layoutSpacing == 1)//Double Space - tabsection.css('line-height', '30px'); + tabsection.css('line-height', layoutSpacing == 1 ? '32px' : '16px'); var qc = createQuestionContent(s); content.append(qc); @@ -459,35 +453,36 @@ function createSectionContent(page) { function createQuestionContent(section) { var content = $('
'); if (section.Questions && section.Questions.length > 0) { - createQuestionContent1(content, section.Questions); + createQuestionContent1(content, section.Questions, false); } else content.append($('
').text(GetTextByKey("P_IPT_NOQUESTIONS", 'No Questions'))); return content; } -function createQuestionContent1(content, questions) { +function createQuestionContent1(content, questions, isidentified) { if (questions && questions.length > 0) { if (layoutStyle == 1) {//Compressed var div_question = $('
'); content.append(div_question); for (var i = 0; i < questions.length; i++) { var q = questions[i]; + if (ignoreQuestion(q, isidentified)) continue; + var tr_question = $(''); div_question.append(tr_question); tr_question.append($('').text(q.DisplayText)); var td_answer = $(''); tr_question.append(td_answer); - createAnswerContent(td_answer, q); + createAnswerContent(td_answer, q, isidentified); var td_comment = $(''); tr_question.append(td_comment); var comment = td_answer.data('comment'); if (comment && comment != "") { td_comment.append($('
').html(replaceHtmlText(comment))); } - if (q.IsImportant && layoutHighlightColor) - tr_question.css('background-color', layoutHighlightColor); + tr_question.css('color', layoutHighlightColor); } if (layoutDivider == 1)//Line @@ -495,16 +490,18 @@ function createQuestionContent1(content, questions) { else if (layoutDivider == 2)//Grid div_question.addClass('question_table_grid'); - if (layoutSpacing == 1)//Double Space - div_question.css('line-height', '30px'); + div_question.css('line-height', layoutSpacing == 1 ? '32px' : '16px'); } else if (layoutStyle == 2) {//Split var div_question = $('
'); content.append(div_question); var tr_question = ""; + var qindex = 0; for (var i = 0; i < questions.length; i++) { var q = questions[i]; - if (i % 2 == 0) { + if (ignoreQuestion(q, isidentified)) continue; + + if (qindex % 2 == 0) { tr_question = $(''); div_question.append(tr_question); } @@ -512,13 +509,15 @@ function createQuestionContent1(content, questions) { tr_question.append(td_question); var td_answer = $(''); tr_question.append(td_answer); - createAnswerContent(td_answer, q); + createAnswerContent(td_answer, q, isidentified); if (q.IsImportant && layoutHighlightColor) { - td_question.css('background-color', layoutHighlightColor); - td_answer.css('background-color', layoutHighlightColor); + td_question.css('color', layoutHighlightColor); + td_answer.css('color', layoutHighlightColor); } + + qindex++; } - if (questions.length % 2 != 0) { + if (qindex % 2 != 0) { tr_question.append($('')); } if (layoutDivider == 1)//Line @@ -526,16 +525,21 @@ function createQuestionContent1(content, questions) { else if (layoutDivider == 2)//Grid div_question.addClass('question_table_grid'); - if (layoutSpacing == 1)//Double Space - div_question.css('line-height', '30px'); - + div_question.css('line-height', layoutSpacing == 1 ? '32px' : '16px'); } else { for (var i = 0; i < questions.length; i++) { var q = questions[i]; - var div_question = $('
'); - content.append(div_question); + if (ignoreQuestion(q, isidentified)) continue; + var tab_question = $('
'); + content.append(tab_question); + var tr_question = $(''); + tab_question.append(tr_question); + var td_question = $(''); + tr_question.append(td_question); + var div_question = $('
'); + td_question.append(div_question); var div_title = $('
').text(q.DisplayText); div_question.append(div_title); if (q.StaticPictures && q.StaticPictures.length > 0) { @@ -544,18 +548,23 @@ function createQuestionContent1(content, questions) { div_question.append(div_pic) } - createAnswerContent(content, q); + tr_question = $(''); + tab_question.append(tr_question); + var td_answer = $(''); + tr_question.append(td_answer); + createAnswerContent(td_answer, q, isidentified); if (layoutDivider == 1)//Line - div_question.addClass('question_line'); + tab_question.addClass('question_standard_table_line'); else if (layoutDivider == 2)//Grid - div_question.addClass('question_div_grid'); + tab_question.addClass('question_standard_table_grid'); - if (layoutSpacing == 1)//Double Space - div_question.css('line-height', '30px'); + tab_question.css('line-height', layoutSpacing == 1 ? '32px' : '16px'); - if (q.IsImportant && layoutHighlightColor) - div_question.css('background-color', layoutHighlightColor); + if (q.IsImportant && layoutHighlightColor) { + tab_question.css('color', layoutHighlightColor); + div_question.css('color', layoutHighlightColor); + } } } @@ -564,38 +573,12 @@ function createQuestionContent1(content, questions) { if (layoutStyle == 1 || layoutStyle == 2) { div_answer.addClass('table_content'); } - else { - var isimportant = div_answer.data('isimportant'); - if (isimportant && layoutHighlightColor) - div_answer.css('background-color', layoutHighlightColor); - - if (layoutDivider == 1)//Line - div_answer.addClass('question_line'); - else if (layoutDivider == 2)//Grid - div_answer.addClass('question_div_grid'); - - if (layoutSpacing == 1)//Double Space - div_answer.css('line-height', '30px'); - } }); content.find('.div_media').each(function () { var div_media = $(this); if (layoutStyle == 1 || layoutStyle == 2) { div_media.css('padding-left', '3px'); } - else { - var isimportant = div_media.data('isimportant'); - if (isimportant && layoutHighlightColor) - div_media.css('background-color', layoutHighlightColor); - - if (layoutDivider == 1)//Line - div_media.addClass('question_line'); - else if (layoutDivider == 2)//Grid - div_media.addClass('question_div_grid'); - - if (layoutSpacing == 1)//Double Space - div_media.css('line-height', '30px'); - } }); } return content; @@ -612,8 +595,39 @@ function createPictures(pictures, p) { } return p; } +function ignoreQuestion(q, isidentified) { + var ignore = false; + if (q.QuestionType == 10 || (q.QuestionType == 15 && q.SubType == 15)) {//Picture + var hasPicture = false; + if (reportdata && reportdata.Answers) { + for (var i = 0; i < reportdata.Answers.length; i++) { + var a = reportdata.Answers[i]; + if (a.QuestionId.toLowerCase() == q.Id.toLowerCase()) { + if (reportdata.Medias && reportdata.Medias.length > 0) { + for (var j = 0; j < reportdata.Medias.length; j++) { + var m = reportdata.Medias[j]; + if (m.AnswerId.toLowerCase() == a.Id.toLowerCase()) { + if (layoutPicturesDisplay == 1)//Displayed At Bottom + { + if (isidentified == false) + mediasdata.push(m); + } + else + hasPicture = true; + } + } + } + } + } + } + ignore = !hasPicture; + } + else + ignore = false; + return ignore; +} -function createAnswerContent(p, q) { +function createAnswerContent(p, q, isidentified) { var leveltext = showSeverityLevel(q.SeverityLevel); var label_level = $('').text(leveltext); if (reportdata && reportdata.Answers) { @@ -638,16 +652,19 @@ function createAnswerContent(p, q) { var div_answer = $('
').data('isimportant', q.IsImportant); if (q.QuestionType == 1 || (q.QuestionType == 15 && q.SubType == 14)) - p.append(div_answer.html(replaceHtmlText(result))).append("
"); + p.append(div_answer.html(replaceHtmlText(result))); else if (q.QuestionType == 17 && q.TextToCompare != null && result.toLowerCase() != q.TextToCompare.toLowerCase()) // BarCodeValidate p.append(div_answer .append($('').text(result)) .append($('').text('(' + q.TextToCompare + ')')) - ).append("
"); + ); else - p.append(div_answer.text(result)).append("
"); + p.append(div_answer.text(result)); div_answer.append(label_level); + p.append(item); + if (layoutStyle == 0) + p.append("
"); } else if (q.QuestionType == 5) {//YesOrNo if (a.SelectedItems && a.SelectedItems.length > 0) { @@ -662,7 +679,10 @@ function createAnswerContent(p, q) { if (a.SelectedItems[0].BackgroundColor && a.SelectedItems[0].BackgroundColor != "") { div_bg.css('background-color', a.SelectedItems[0].BackgroundColor); } - p.append(item).append("
"); + + p.append(item); + if (layoutStyle == 0) + p.append("
"); } } else if (q.QuestionType == 8 || q.QuestionType == 9//DropDown、List @@ -682,7 +702,10 @@ function createAnswerContent(p, q) { if (a.SelectedItems[j].BackgroundColor && a.SelectedItems[j].BackgroundColor != "") { div_bg.css('background-color', a.SelectedItems[j].BackgroundColor); } - p.append(item).append("
"); + + p.append(item); + if (layoutStyle == 0) + p.append("
"); } } } @@ -699,7 +722,9 @@ function createAnswerContent(p, q) { if (a.SelectedItems[0].BackgroundColor && a.SelectedItems[0].BackgroundColor != "") { div_bg.css('background-color', a.SelectedItems[0].BackgroundColor); } - p.append(item).append("
"); + p.append(item); + if (layoutStyle == 0) + p.append("
"); } } } @@ -726,7 +751,10 @@ function createAnswerContent(p, q) { var m = reportdata.Medias[j]; if (m.AnswerId.toLowerCase() == a.Id.toLowerCase()) { if (layoutPicturesDisplay == 1)//Displayed At Bottom - mediasdata.push(m); + { + if (isidentified == false) + mediasdata.push(m); + } else {//Displayed As Taken var media = createMedias(m); pics.append(media); @@ -745,8 +773,10 @@ function createAnswerContent(p, q) { if (a.SelectedItems[0].BackgroundColor && a.SelectedItems[0].BackgroundColor != "") { div_bg.css('background-color', a.SelectedItems[0].BackgroundColor); } - p.append(divanswer).append("
"); + p.append(divanswer); + if (layoutStyle == 0) + p.append("
"); } divanswer.append(label_level); if (layoutPicturesDisplay != 1) {//Displayed At Bottom @@ -758,7 +788,10 @@ function createAnswerContent(p, q) { var m = reportdata.Medias[j]; if (m.AnswerId.toLowerCase() == a.Id.toLowerCase()) { if (layoutPicturesDisplay == 1)//Displayed At Bottom - mediasdata.push(m); + { + if (isidentified == false) + mediasdata.push(m); + } else {//Displayed As Taken var media = createMedias(m); pics.append(media); @@ -767,17 +800,21 @@ function createAnswerContent(p, q) { } } if (a.Result && a.Result != "") { - p.append($('
').data('isimportant', q.IsImportant).html(replaceHtmlText(a.Result))); + var divresult = $('
').data('isimportant', q.IsImportant).html(replaceHtmlText(a.Result)); + p.append(divresult); + if (q.IsImportant && layoutHighlightColor) + divresult.css('color', layoutHighlightColor); } } if (layoutStyle != 1 && layoutStyle != 2 && a.Comment && a.Comment != "") { - p.append($('
').data('isimportant', q.IsImportant).html(replaceHtmlText(a.Comment))); + var divcomment = $('
').data('isimportant', q.IsImportant).html(replaceHtmlText(a.Comment)); + p.append(divcomment); + if (q.IsImportant && layoutHighlightColor) + divcomment.css('color', layoutHighlightColor); } - return; } } } - p.append($('
').text("")); //public string Id { get; set; } @@ -811,7 +848,6 @@ function createAnswerContent(p, q) { //如果AssetStatus类型，result存的是notes - return result; } function convertUnits(u) { diff --git a/Site/Inspection/js/view-main.js b/Site/Inspection/js/view-main.js index afd07a0..9ae2bc9 100644 --- a/Site/Inspection/js/view-main.js +++ b/Site/Inspection/js/view-main.js @@ -5,7 +5,7 @@ //spectrum: "../../js/spectrum" }, waitSeconds: 0, - urlArgs: "v=38" //+ Math.random() + urlArgs: "v=39" //+ Math.random() }) requirejs(['modules/inspects/editinspection'], function (EditModule) { diff --git a/Site/IronIntelMasterPage.master b/Site/IronIntelMasterPage.master index 9825ea8..f365e87 100644 --- a/Site/IronIntelMasterPage.master +++ b/Site/IronIntelMasterPage.master @@ -1072,7 +1072,7 @@
- Select All + Select All
diff --git a/Site/Maintenance/WorkOrderMaintenance.aspx b/Site/Maintenance/WorkOrderMaintenance.aspx index 7b8b8f3..52ac229 100644 --- a/Site/Maintenance/WorkOrderMaintenance.aspx +++ b/Site/Maintenance/WorkOrderMaintenance.aspx @@ -166,6 +166,39 @@ opacity: 1; opacity: initial } + + html::-webkit-scrollbar { + width: 8px; + height: 8px; + } + html::-webkit-scrollbar-thumb { + background-color: rgba(168, 168, 168, 0.9); + border-radius: 4px; + } + + #workorderspliter { + height: 6px; + background-color: gray; + cursor: ns-resize; + margin: 6px 0 4px; + } + + #workorderdetail { + position: relative; + overflow: auto; + } + #workorderdetail::-webkit-scrollbar { + width: 8px; + height: 8px; + } + #workorderdetail::-webkit-scrollbar-thumb { + background-color: rgba(168, 168, 168, 0.9); + border-radius: 4px; + } + + #workorderdetail>.ui-popup-mask { + position: absolute; + } " rel="stylesheet" /> @@ -1010,6 +1043,10 @@ var dialogWidgets; + var widgetHeight = Number(localStorage.getItem('spliter_height')); + if (isNaN(widgetHeight) || widgetHeight < 100 || widgetHeight > 1000) { + widgetHeight = 300; + } $(function () { setPageTitle(GetTextByKey("P_WORKORDER", "Work Order"), true); $('.iconlayout').on('click', function (ev) { @@ -1062,8 +1099,17 @@ }); $(window).resize(function () { - $("#workorderlist").css("height", $(window).height() - $("#workorderlist").offset().top - 10); + var top = $("#workorderlist").offset().top; + var height = $(window).height() - top - 10; + var widget = wowidgetobj?.workorderwidgets?.length > 0; + if (widget) { + height -= widgetHeight + 10; + } + $("#workorderlist").css("height", height); grid_dt && grid_dt.resize(); + //if (widget) { + // $('#workorderdetail').css('height', top + height + 6); + //} }).resize(); $('#dialog_alerts').prop('iframe', true).dialog(function () { @@ -1102,6 +1148,46 @@ $('#spExport').hide(); } + var list = document.querySelector('#workorderlist'); + var detail = document.querySelector('#workorderdetail'); + detail.style.height = widgetHeight + 'px'; + document.querySelector('#workorderspliter').addEventListener('mousedown', function (e) { + if (e.buttons !== 1) { + return; + } + var oy = e.clientY; + var oheight = widgetHeight; + var parent = document.body; + var top = document.querySelector('#workorderlist').offsetTop; + var windowHeight = window.innerHeight; + var gridbody = list.querySelector('.data-grid-body'); + var headerHeight = list.querySelector('.data-grid-table-header').offsetHeight; + var move = function (e2) { + if (e2.buttons !== 1) { + parent.dispatchEvent(new MouseEvent('mouseup')); + return; + } + var y = e2.clientY - oy; + var height = oheight - y; + if (height > 100) { + widgetHeight = height; + detail.style.height = widgetHeight + 'px'; + + height = windowHeight - top - 10 - height - 10; + list.style.height = height + 'px'; + gridbody.style.height = (height - headerHeight) + 'px'; + } + }; + parent.addEventListener('mousemove', move, { passive: false }); + var up = function () { + grid_dt?.resize(); + parent.removeEventListener('mousemove', move, { passive: false }); + parent.removeEventListener('mouseup', up); + localStorage.setItem('spliter_height', String(widgetHeight)); + }; + parent.addEventListener('mouseup', up); + }); + openmsgwebsocket(); }); @@ -1437,7 +1523,8 @@
-
+ +