diff --git a/ReportService/Views/Home/Index.cshtml b/ReportService/Views/Home/Index.cshtml index 320e169..5775744 100644 --- a/ReportService/Views/Home/Index.cshtml +++ b/ReportService/Views/Home/Index.cshtml @@ -1,16 +1,17 @@ 
-
@RenderSection("Scripts",required: false) + diff --git a/ReportService/wwwroot/css/site.css b/ReportService/wwwroot/css/site.css index f7f71f2..1a271d8 100644 --- a/ReportService/wwwroot/css/site.css +++ b/ReportService/wwwroot/css/site.css @@ -2,70 +2,107 @@ for details on configuring this project to bundle and minify static web assets. */ a.navbar-brand { - white-space: normal; - text-align: center; - word-break: break-all; + white-space: normal; + text-align: center; + word-break: break-all; } /* Provide sufficient contrast against white background */ a { - color: #0366d6; + color: #0366d6; } .btn-primary { - color: #fff; - background-color: #1b6ec2; - border-color: #1861ac; + color: #fff; + background-color: #00AE44; + border-color: #fff; } .nav-pills .nav-link.active, .nav-pills .show > .nav-link { - color: #fff; - background-color: #1b6ec2; - border-color: #1861ac; + color: #fff; + background-color: #1b6ec2; + border-color: #1861ac; } /* Sticky footer styles -------------------------------------------------- */ html { - font-size: 14px; + font-size: 14px; } + @media (min-width: 768px) { - html { - font-size: 16px; - } + html { + font-size: 16px; + } } .border-top { - border-top: 1px solid #e5e5e5; + border-top: 1px solid #e5e5e5; } + .border-bottom { - border-bottom: 1px solid #e5e5e5; + border-bottom: 1px solid #e5e5e5; } .box-shadow { - box-shadow: 0 .25rem .75rem rgba(0, 0, 0, .05); + box-shadow: 0 .25rem .75rem rgba(0, 0, 0, .05); } button.accept-policy { - font-size: 1rem; - line-height: inherit; + font-size: 1rem; + line-height: inherit; } /* Sticky footer styles -------------------------------------------------- */ html { - position: relative; - min-height: 100%; + position: relative; + min-height: 100%; } body { - /* Margin bottom by footer height */ - margin-bottom: 60px; + /* Margin bottom by footer height */ + margin-bottom: 60px; } + .footer { - position: absolute; - bottom: 0; - width: 100%; - white-space: nowrap; - line-height: 60px; /* Vertically center the text there */ + position: absolute; + bottom: 0; + width: 100%; + white-space: nowrap; + line-height: 30px; /* Vertically center the text there */ } + +.reportForm { + border: 1px solid #000; + padding: 2px; +} + + .reportForm .reportItem { + background-color: #8FBEE8; + border: 1px solid #fff; + padding: 2px 10px; + } + +.menu-v { + display: inline-block; + list-style: none; + width: 100%; +} + +.menu-item-v { + display: inline-block; +} + +.reportFilter { + padding: 3px 3px; +} + +.reportTable { +} + + .reportTable th { + } + + .reportTable td { + } diff --git a/ReportService/wwwroot/images/logo75.png b/ReportService/wwwroot/images/logo75.png new file mode 100644 index 0000000..cc834c1 Binary files /dev/null and b/ReportService/wwwroot/images/logo75.png differ diff --git a/ReportService/wwwroot/report/报表1.html b/ReportService/wwwroot/report/报表1.html index 91a5bc5..b845cf8 100644 --- a/ReportService/wwwroot/report/报表1.html +++ b/ReportService/wwwroot/report/报表1.html @@ -1,5 +1,5 @@ 
-
+
@@ -9,11 +9,12 @@ - - + + +
- +
diff --git a/ReportService/wwwroot/report/报表1.rpt.html b/ReportService/wwwroot/report/报表1.rpt.html index cca7a01..a7776e0 100644 --- a/ReportService/wwwroot/report/报表1.rpt.html +++ b/ReportService/wwwroot/report/报表1.rpt.html @@ -64,7 +64,7 @@ myjs.post(this.url, { sql: sql }, function (d) { findPersonPrint.result = d; }); - myjs.GetServerTime("yyyy年MM月dd日 HH点", function (r) { + myjs.GetServerTime("yyyy年MM月dd日", function (r) { _this.printTime = r; }); },
姓名