From c25a875ecbdf3aa107e94f91574fa4dda129dfbb Mon Sep 17 00:00:00 2001
From: wanggang <76527413@qq.com>
Date: Thu, 28 Jan 2021 13:43:41 +0800
Subject: [PATCH] update

Former-commit-id: b797c18b0958f9a612f8f660d1e246c30732febf
Former-commit-id: 0d181414713b88444de486792ce60a702b112883
---
 docs/物联网中心.EAP                      | Bin 1304576 -> 1304576 bytes
 .../TeacherExt/Views/Home/Update.cshtml       |  10 +--
 labs/Teacher/TeacherExt/wwwroot/css/site.css  |  63 ++++++++++++++----
 3 files changed, 52 insertions(+), 21 deletions(-)

diff --git a/docs/物联网中心.EAP b/docs/物联网中心.EAP
index 5fbcdd4acb964c305cd8b3a077e5315f51fac3a5..25f9c70e494ffa41fc6a42559fdc9925cbfece46 100644
GIT binary patch
delta 1224
zcmZ`%UuYCZ7@wKl?9OT~yLU%ReDXA*NU`RQ+CEgH8{=_7Jaceo;!(_Hb2mw@P43Ry
z%^yLyRd5aZk|??-h(xsbdbF4+f_-eEsE7!P=#wvfkt%H=r4;(j`6q3f%<_HneZTq5
zZ|3`E-3R^dgZ>6l@cr+C%CGoBL}@!kJ&HX_JSurq_GrrzRa*P7!UHMg@4!Oiv_F3}
z{Lw-q=Nm^ioEC2EQeBq=2M2l%%E(i^AHT&}KRB%P)zX<{?tnFI<qq5I5Sz)c$;yP~
zu<qEd_bdG)U$MN?UoEnd!wTuCN~K(Nx}z(E1S_#BY|2!v{JWjKsnpt%VqrzG_J2u1
zSW|Hwy|u~db=c{D9S&!IxvHMt^qO+%Y&sK9_O8}^(}Q=5t1rzz8BxOc^JKZeCW?7$
zU%7C+d&gvXS8{)1Un*UkjL)+Clv6C1;-#@-iN$9fR<a>&68YY|l90ZDW(-!XN`+PJ
z?x|Ao*c8iEoa*k5Og0to*t6Llx2ml0A83YIUkiYr7*#y{VVC+dLP$lwsL#}AKQ+`7
zDpM0G52mCp^)q5S@NAP-ejLuvVq{8pfed3)027JiCoJ23BqNi&g+mI!J}WEMndfB%
zOy$qZwCfd4`GH~WW0FFCtX=NpM~Ag<Hmkq4Y{v+Nea+Q6q@7CVtu4mOmW2lGlqt$E
z+Yz==m52`cel`mK*c-2Ffbl+0yN&S^Uz*d7VB(+rfn4FsbJ}CvN)e6*Yp$3={=KtW
zl5cxKp33Ae?9207PmLgCA{iM7!$%ARF(ec~Z~}{n(1kK#0gD-7YBnhd%gt>OWSBst
z2)IHBM5usd2w?*eA}%5n5fij1kXFWpLyJ54^1N2T+SusG42VaAoSoNtBz3x(h4}T0
zT7r0W&8u(l>Kna!t5**!)!SNM;UPaTr*FkWJUXX8)YTYz4K2+1T3x?`|6I5h`=CbR
zJ+V(?(ZiJjJe?iW+u%uf;IjUQA~n!!(WkKAzNjA?gv*Ok4N<A+hAHx9TOu&Y02A=g
z4_7cm96{I=1rry%C>CN_WClb;lnedzw|pOJ=gW)wImsBz4i3!Ph2fdeX%PQyh`TrR
Um*k9lQwKA^f?y%;-VD3uKTD)oBme*a

delta 626
zcmX|7L1+^}6#aj8GrQAfv$I*0phA}@9z>xkUS$hK1D4i;h&@CTi+T}asmC7Hg43Xv
z#G<o3C_N~>2E`7D7DNOQ55<cV6a+zv2(||y2L=BqIPhoQfAi-5_a|GQ$kr!%jN_Xp
z5&waU2`|n2%17lh<vYrEm0wu(d9j8C6P)J11KoKL@9*|5{6A%V;HIYSN`yGX#?Fq6
zF;M&v0{|U0cuh|wT%pu2KRXrEZ?j`)9yfW6=GR4j!ZGSHpTqK`_m=bp*z`Vnue~Mj
zl4qiHaMIIrE#8c$uQq3Ar(8(!9jR!Q`NBrahG#Zf{?RQQ*Fi%ZVB??<SKNK3-Vl$5
zygmFN0z_J5V(-(c{9fqxhD}Y0XNX_5(-!9ztF`-NNqj*4>6SQUc70)+E{m9UJ7S~-
z;HCg5K|%rugaI=mAtOctFoNKNy^!_<nGs_pGX3|A0lJdpR%;ow7^x~jpNiTdenM{%
zFwv1IjGBH&TtjpHjyUd^=Xb>@>-Ki4T&R3N<%23OsytZDOT{g$>!2N0v2KRj;rq}#
z3EMR5c`fqrg`QtyM|8hZ+F^pF@F#a(!M47!#$sJr4rk6Jb_Pbx$qb|B$zPCwn^{2K
zGoq|HNuv?tT8H%cl)K<tf>@i;2c!frfmF{_#ctDI4sSc=-ox-4*^U>om5@SGL=<I{
It;AXS2Z~#pIRF3v

diff --git a/labs/Teacher/TeacherExt/Views/Home/Update.cshtml b/labs/Teacher/TeacherExt/Views/Home/Update.cshtml
index e1c475a3..f6111fca 100644
--- a/labs/Teacher/TeacherExt/Views/Home/Update.cshtml
+++ b/labs/Teacher/TeacherExt/Views/Home/Update.cshtml
@@ -50,7 +50,7 @@
                     var uihit = prop.DataTypeName ?? prop.TemplateHint;
                     <div class="col-sm-6">
                         <div class="form-group row @prop.ModelType.Name @uihit">
-                            @Html.Label(prop.PropertyName, prop.GetDisplayName() + "：", new { @class = labelCalss })
+                            @Html.Label(prop.PropertyName, prop.GetDisplayName(), new { @class = labelCalss })
                             <div class="col-sm-6" title="@desc">
                                 @if (isReadOnly)
                                 {
@@ -392,12 +392,4 @@
             window.open(url);
         });
     </script>
-}
-@section styles{
-    <style>
-        label.required:before {
-            content: '*';
-            color: red;
-        }
-    </style>
 }
\ No newline at end of file
diff --git a/labs/Teacher/TeacherExt/wwwroot/css/site.css b/labs/Teacher/TeacherExt/wwwroot/css/site.css
index e00f2286..64e6c214 100644
--- a/labs/Teacher/TeacherExt/wwwroot/css/site.css
+++ b/labs/Teacher/TeacherExt/wwwroot/css/site.css
@@ -77,50 +77,89 @@ th {
 
 h1 {
     font-size: 1.5rem;
-    margin:1rem 0 0 0;
+    margin: 1rem 0 0 0;
 }
-.breadcrumb.float-sm-right{
-    background-color:transparent;
+
+.breadcrumb.float-sm-right {
+    background-color: transparent;
 }
+
 .select2-container--bootstrap4 .select2-results > .select2-results__options {
     max-height: 400px;
 }
+
 .select2-selection.select2-selection--single {
     padding-left: 0.75rem;
 }
+
 .select2-container--bootstrap4 .select2-selection--single .select2-selection__placeholder {
     color: #495057;
 }
+
 label.col-form-label {
     text-align: right;
     overflow: hidden;
 }
+
 img.icon {
     height: 48px;
     width: 48px;
-    margin:0 auto;
+    margin: 0 auto;
 }
+
 img.pointer {
     cursor: pointer;
     height: 32px;
     width: 32px;
     margin: 8px auto;
 }
-.card-body.device{
-    padding:10px;
+
+.card-body.device {
+    padding: 10px;
 }
 
-.h48{
-    width:100%;
-    height:48px;
-    line-height:48px;
-    margin:0 auto;
-    overflow:hidden;
+.h48 {
+    width: 100%;
+    height: 48px;
+    line-height: 48px;
+    margin: 0 auto;
+    overflow: hidden;
 }
+
 .h24 {
     width: 100%;
     height: 24px;
     line-height: 24px;
     margin: 0 auto;
     overflow: hidden;
+}
+
+.form-control {
+    font-size: 14px !important;
+}
+label.col-form-label {
+    font-size: 14px !important;
+    font-weight: normal !important;
+}
+
+label.required:before {
+    content: '*';
+    color: red;
+    font-size: 14px;
+}
+
+label.col-form-label:after {
+    content: '：';
+    position: absolute;
+    top: 8px;
+    font-size: 14px;
+    line-height: 17px;
+}
+button.swal2-styled{
+    font-size:14px!important;
+    line-height:20px;
+    padding:5px 10px;
+}
+.swal2-popup{
+    width:16em!important;
 }
\ No newline at end of file