App 2.3.2

App/Relese/Content/Css/ExerciseV2/stu-cmd_leader.css

@@ -188,6 +188,7 @@
   background: rgba(255, 255, 255, 0.6);
   border-radius: 8px;
   margin: 5px 0;
+  overflow: hidden;
 }
 .box .logs-box .log-box .content {
   width: 100%;

App/Relese/Content/Scss/ExerciseV2/stu-bg.scss

@@ -1,15 +1,15 @@
 @import "./_stu-body";
 @import "./_stu-form";
+
 .box {
     width: 100%;
     position: relative;
     font-family: 'Source Han Sans';
     background: none;
 
-
     .body {
         width: 100%;
-        height:calc(100vh - 100px);
+        height: calc(100vh - 100px);
         display: flex;
         flex-direction: column;
         align-items: center;
@@ -35,7 +35,6 @@
                 animation: spin 4s linear infinite;
             }
 
-
             .ico {
                 position: absolute;
                 width: 90px;
@@ -76,9 +75,8 @@
         }
 
         .body {
-
             .icon {
-                --w: 300px;
+                --w: 180px;
 
                 .ico {
                     width: 120px;
@@ -87,7 +85,7 @@
             }
 
             .name {
-                font-size: 90px;
+                font-size: 40px;
                 letter-spacing: 10px;
                 padding-left: 10px;
             }
@@ -95,17 +93,26 @@
     }
 }
 
-    @keyframes spin {
-        0% {
-            transform: rotate(0deg);
-        }
+@media(min-width:1200px) {
+    .box.public .body .icon {
+        --w: 300px;
+    }
 
+    .box.public .body .name {
+        font-size: 90px;
+    }
+}
 
-        50% {
-            transform: rotate(180deg);
-        }
+@keyframes spin {
+    0% {
+        transform: rotate(0deg);
+    }
 
-        100% {
-            transform: rotate(360deg);
-        }
+    50% {
+        transform: rotate(180deg);
+    }
+
+    100% {
+        transform: rotate(360deg);
     }
+}

App/Relese/Content/Scss/ExerciseV2/stu-cmd_leader.scss

@@ -3,7 +3,6 @@
 @import "./_stu-form";
 
 .box {
-
     .box-body {
         position: relative;
 
@@ -27,6 +26,7 @@
             background: rgba(255, 255, 255, 0.6);
             border-radius: 8px;
             margin: 5px 0;
+            overflow: hidden;
 
             .content {
                 width: 100%;
@@ -67,13 +67,13 @@
 
         .empty {
             width: 100%;
-            height:100%;
+            height: 100%;
             display: flex;
             justify-content: center;
             align-items: center;
             color: #36536D;
-            font-size:16px;
-            opacity:.4;
+            font-size: 16px;
+            opacity: .4;
         }
     }
 }
@@ -149,5 +149,4 @@
         opacity: 1;
         transform: scale(1)
     }
-}
-
+}

App/Relese/Views/ExerciseV2/Leader.cshtml

@@ -11,7 +11,7 @@
 @section css{
     <link href="~/Content/Css/ExerciseV2/stu-cmd_leader.min.css" rel="stylesheet" />
 }
-@Html.Partial("Layout/V2/_Bg",false)
+@Html.Partial("Layout/V2/_Bg", false)
 <div class="box  no-select" style="">
     <div id="bg_title">
         <span class="title">决策指令下达</span>
@@ -29,7 +29,6 @@
             <div class="body-card">
                 <div class="btn" onclick="SubmitNextScene()">进入下一阶段场景</div>
             </div>
-
         </div>
     </div>
     <div style="position: absolute; left: 0; bottom: 0; color: #ddd; opacity: 0.5;">@(groupName)</div>
@@ -110,7 +109,8 @@
                         url: abp.appUrl + "Eval/OperationScene?id=" + id,
                         success: function() {
                             $that.addClass('send');
-                            $that.find('.btn').html('已下达');
+                            $that.find('.btn-box').html('<div class="btn btn-small">已下达</div>');
+
                         }
                     });
                 });
@@ -160,10 +160,12 @@
         function FormatLog(data) {
             var str = "";
             if (data) {
-                var msg = data.word ? data.word : "",
+                var h = 50 + (Math.floor(data.word.length / 60)+1) * 21,
+                    msg = data.word ? data.word : "",
                     state = data.logState == '@(LogStateDefinition.New)' ? '' : 'send',
                     btn = data.logState == '@(LogStateDefinition.New)' ? '<div class="btn btn-small" onclick="RoleHandle(this)">下达指令</div>' : '<div class="btn btn-small">已下达</div>';
-                str = '<div class="log-box {0}" data-id="{1}"><div class="content"><div class="title">{2}</div><div class="text">{3}</div></div><div class="btn-box">{4}</div></div>'.format(state, data.id, data.role, msg, btn);
+                console.log(h)
+                str = '<div class="log-box {0}" data-id="{1}" style="min-height:{5}px"><div class="content"><div class="title">{2}</div><div class="text">{3}</div></div><div class="btn-box">{4}</div></div>'.format(state, data.id, data.role, msg, btn,h);
             }
             return str;
         }

App/Relese/Views/ExerciseV2/Student.cshtml

@@ -10,7 +10,7 @@
 @section css{
     <link href="~/Content/Css/ExerciseV2/stu-cmd.min.css" rel="stylesheet" />
 }
-@Html.Partial("Layout/V2/_Bg",false)
+@Html.Partial("Layout/V2/_Bg", false)
 <div class="box public no-select" style="">
     <div class="box-title">决策指令下达</div>
     <div class="box-body ">
@@ -52,9 +52,9 @@
                     var str = "<option value='self'>自定义角色</option>"
                     if (res) {
                         res += str
-                        $('#role-select').html(res).select2();
+                        $('#role-select').html(res).select2({ minimumResultsForSearch: -1 });
                     } else {
-                        $('#role-select').html(str).select2();
+                        $('#role-select').html(str).select2({ minimumResultsForSearch: -1 });
                     }
                 }
             });
@@ -63,7 +63,7 @@
                 success: function(res) {
                     if (res) {
                         //$('.help-box').show();
-                        $('select[name="help"]').html(`<option value="">请选择提示信息</option>` + res).select2();
+                        $('select[name="help"]').html(`<option value="">请选择提示信息</option>` + res).select2({ minimumResultsForSearch: -1 });
                     } else {
                         $('.help-box').hide();
                     }
@@ -119,7 +119,7 @@
                     return;
                 }
             }
-           
+
             if (!word) {
                 abp.message.warn('请输入指令后再提交！');
                 return;

App/Relese/Views/ExerciseV2/WaitRport.cshtml

@@ -90,4 +90,4 @@
             </text>
         }
     </script>
-}
+}

App/Relese/Web.config

@@ -34,7 +34,8 @@
     <!-- <add key="aspnet:AllowAsyncDuringSyncStages" value="true" /> -->
   </appSettings>
   <connectionStrings>
-    <add name="Default" connectionString="Server=.\Y; Database=We_AppDb_V2.2_Dev; User Id=sa;Password=123456" providerName="System.Data.SqlClient" />
+    <!-- <add name="Default" connectionString="Server=.\Y; Database=We_AppDb_V2.2_Dev; User Id=sa;Password=123456" providerName="System.Data.SqlClient" /> -->
+    <add name="Default" connectionString="Server=shvber.com,5016; Database=We_AppDb_V2.2_Dev; User Id=iwb;Password=123456Qsc" providerName="System.Data.SqlClient" />
     <!--<add name="Default" connectionString="Server=192.168.0.101:49173; Database=We_AppDb_V2.1; User Id=sa;Password=Iwb2017" providerName="System.Data.SqlClient" />-->
   </connectionStrings>
   <!--