diff --git a/web/admin/item/TabletDesigner.aspx b/web/admin/item/TabletDesigner.aspx index 371d201..3722630 100644 --- a/web/admin/item/TabletDesigner.aspx +++ b/web/admin/item/TabletDesigner.aspx @@ -3,6 +3,11 @@ <%@ Register Src="~/admin/_uc/alert.ascx" TagPrefix="uc1" TagName="alert" %> + diff --git a/web/admin/item/css/tablet-design.css b/web/admin/item/css/tablet-design.css index 07d3992..6710085 100644 --- a/web/admin/item/css/tablet-design.css +++ b/web/admin/item/css/tablet-design.css @@ -1,7 +1,7 @@ :host { display: block; - width: 100%; - height: 100%; + width: auto; + height: auto; --canvas-bg: #f8f9fa; --canvas-grid: #dee2e6; --paper-bg: #fffbf0; @@ -27,7 +27,7 @@ background-image: linear-gradient(45deg, var(--canvas-grid) 25%, transparent 25%), linear-gradient(-45deg, var(--canvas-grid) 25%, transparent 25%), linear-gradient(45deg, transparent 75%, var(--canvas-grid) 75%), linear-gradient(-45deg, transparent 75%, var(--canvas-grid) 75%); background-size: 20px 20px; transition: background-color 0.3s; - min-height: 100vw; +/* min-height: 100vw;*/ } diff --git a/web/admin/print/print_multi_new.aspx b/web/admin/print/print_multi_new.aspx index 30a9ce0..6174aff 100644 --- a/web/admin/print/print_multi_new.aspx +++ b/web/admin/print/print_multi_new.aspx @@ -15,49 +15,71 @@ + -
-
-
- - <%--
+ + 列印 +
+
+ + <%--
--%> - <%--
--%> -
-
- - - -
+ + + + @@ -71,11 +93,11 @@