20240625

App/Relese/Content/Css/ExerciseV2/screen.css

@@ -57,6 +57,7 @@ body {
   background-image: linear-gradient(rgba(0, 0, 0, 0.1), rgba(0, 0, 0, 0.1));
   border-color: rgba(0, 0, 0, 0.1);
   color: #DAEDFF;
+  font-weight: 600;
 }
 
 .vb-btn {
@@ -287,6 +288,19 @@ body {
   margin: 0 5px;
   padding: 3px 8px;
 }
+.box .scene-box .guide-box {
+  margin: 10px 0;
+  padding: 10px;
+  background: var(--bg);
+  border-radius: 5px;
+}
+.box .scene-box .guide-box p {
+  margin: 0;
+  font-size: 13px;
+}
+.box .scene-box .guide-box .guide-title {
+  font-weight: 600;
+}
 .box .scene-box .desc {
   padding: 8px;
   color: #36536D;
@@ -470,6 +484,10 @@ body {
   font-size: 1rem;
   font-weight: 400;
 }
+.box .score-box.system-score .name {
+  font-size: 16px;
+  font-weight: 600;
+}
 .box.plan-box {
   margin: 5px 10px;
   border: 1px solid #a5d4f4;
@@ -513,9 +531,29 @@ body {
   overflow: hidden;
 }
 
-#modal-role-plan .modal-title-span {
+.modal .modal-header {
   color: var(--tc);
 }
+.modal .modal-header .close {
+  font-size: 30px;
+}
+.modal .modal-footer {
+  margin: 0 auto;
+}
+.modal .modal-footer .btn-outline-iwb {
+  background: #F5F5F5;
+  color: #36536D;
+  border: 1px solid #F3F3F3;
+}
+.modal .modal-footer .btn-iwb {
+  margin: 0 15px;
+  padding: 8px 20px;
+  background: #03AEBC;
+  border-color: #03AEBC;
+  border-radius: 8px;
+  color: #DAEDFF;
+  font-size: 16px;
+}
 
 .load-box {
   position: fixed;

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

@@ -24,6 +24,7 @@
   background-image: linear-gradient(rgba(0, 0, 0, 0.1), rgba(0, 0, 0, 0.1));
   border-color: rgba(0, 0, 0, 0.1);
   color: #DAEDFF;
+  font-weight: 600;
 }
 
 .vb-btn {

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

@@ -86,6 +86,7 @@
   background-image: linear-gradient(rgba(0, 0, 0, 0.1), rgba(0, 0, 0, 0.1));
   border-color: rgba(0, 0, 0, 0.1);
   color: #DAEDFF;
+  font-weight: 600;
 }
 
 .vb-btn {
@@ -208,5 +209,5 @@
   position: absolute;
   left: 15px;
   bottom: 15px;
-  width: 300px;
+  width: 70%;
 }

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

@@ -86,6 +86,7 @@
   background-image: linear-gradient(rgba(0, 0, 0, 0.1), rgba(0, 0, 0, 0.1));
   border-color: rgba(0, 0, 0, 0.1);
   color: #DAEDFF;
+  font-weight: 600;
 }
 
 .vb-btn {
@@ -176,44 +177,55 @@
   display: flex;
   flex-direction: column;
 }
-.box .table-box {
-  display: block;
+.box .logs-box {
+  width: 100%;
+  display: flex;
+  flex-direction: column;
 }
-.box .table-box tr {
-  border-top: 1px solid #36536d;
+.box .logs-box .log-box {
+  display: flex;
+  padding: 10px;
+  background: rgba(255, 255, 255, 0.6);
+  border-radius: 8px;
+  margin: 5px 0;
 }
-.box .table-box tr:nth-of-type(2n+1) {
-  background: linear-gradient(rgba(0, 0, 0, 0.02), rgba(0, 0, 0, 0.02));
+.box .logs-box .log-box .content {
+  width: 100%;
+  display: flex;
+  flex-direction: column;
+  padding: 5px;
+  padding-right: 15px;
 }
-.box .table-box tr.empty td {
-  padding: 8px;
+.box .logs-box .log-box .content .title {
+  font-weight: 600;
+  color: #03AEBC;
+  font-size: 14px;
 }
-.box .table-box th {
-  color: #fff;
-  background: #4585cc;
-  text-align: center;
+.box .logs-box .log-box .content .text {
+  color: #36536D;
 }
-.box .table-box td {
-  color: #36536d;
-  text-align: center;
-  padding: 6px 10px;
+.box .logs-box .log-box .btn-box {
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  padding: 5px;
 }
-.box .table-box .state {
-  border: 1px solid #4585cc;
-  border-radius: 5px;
-  font-size: 12px;
-  padding: 2px 5px;
-  color: #4585cc;
-}
-.box .table-box .btn {
-  background: #4585cc;
-  border-radius: 20px;
-  padding: 2px 15px;
-  color: #eee;
-}
-.box .table-box .send .state {
-  background: #4585cc;
-  color: #fff;
+.box .logs-box .log-box .btn-box .btn {
+  font-size: 14px;
+  width: 90px;
+}
+.box .logs-box .log-box.send .btn {
+  background: #DE5E5E;
+}
+.box .logs-box .empty {
+  width: 100%;
+  height: 100%;
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  color: #36536D;
+  font-size: 16px;
+  opacity: 0.4;
 }
 
 .question {

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

@@ -86,6 +86,7 @@
   background-image: linear-gradient(rgba(0, 0, 0, 0.1), rgba(0, 0, 0, 0.1));
   border-color: rgba(0, 0, 0, 0.1);
   color: #DAEDFF;
+  font-weight: 600;
 }
 
 .vb-btn {

App/Relese/Content/Css/iwb.style.css

@@ -1,5 +1,6 @@
 @charset "UTF-8";
 /*$main-color: #007bff;*/
+/*$main-color: #11998e;*/
 body .sidebar {
   overflow-x: hidden !important;
 }
@@ -13,10 +14,10 @@ body .content-wrapper {
   padding: 5px 10px;
 }
 body .content-wrapper .dropdown-menu {
-  border-color: #11998e;
+  border-color: #03aebc;
 }
 body .content-wrapper .dropdown-menu .dropdown-item {
-  color: #11998e;
+  color: #03aebc;
   border-bottom: 1px solid #eee;
 }
 body .content-wrapper .dropdown-menu .dropdown-item:first-child {
@@ -24,12 +25,12 @@ body .content-wrapper .dropdown-menu .dropdown-item:first-child {
 }
 body .content-wrapper .dropdown-menu .dropdown-item:active, body .content-wrapper .dropdown-menu .dropdown-item.active {
   color: #fff !important;
-  background-color: #11998e;
+  background-color: #03aebc;
 }
 body .content-wrapper .dropdown-menu .dropdown-item:focus, body .content-wrapper .dropdown-menu .dropdown-item:hover {
   color: #fff;
   text-decoration: none;
-  background-color: #11998e;
+  background-color: #03aebc;
 }
 body label.iwb-label {
   text-align: right;
@@ -45,10 +46,10 @@ body label.iwb-label-required::before {
   text-align: right;
 }
 body .text-iwb {
-  color: #11998e;
+  color: #03aebc;
 }
 body .text-p, body.text-primary {
-  color: #11998e;
+  color: #03aebc;
 }
 body .text-s, body.text-success {
   color: #28a745;
@@ -64,25 +65,25 @@ body .text-d, body.text-danger {
 }
 
 .nav-tabs {
-  border-bottom: 1px solid #11998e;
+  border-bottom: 1px solid #03aebc;
 }
 .nav-tabs .nav-item.show .nav-link {
   color: #fff;
-  background-color: #11998e;
-  border-color: #11998e;
+  background-color: #03aebc;
+  border-color: #03aebc;
 }
 .nav-tabs .nav-link {
-  color: #11998e;
+  color: #03aebc;
 }
 .nav-tabs .nav-link:focus, .nav-tabs .nav-link:hover {
-  border-color: #11998e #11998e #11998e;
-  color: #11998e;
+  border-color: #03aebc #03aebc #03aebc;
+  color: #03aebc;
   font-weight: 600;
 }
 .nav-tabs .nav-link.active {
   color: #fff;
-  background-color: #11998e;
-  border-color: #11998e;
+  background-color: #03aebc;
+  border-color: #03aebc;
 }
 
 .label {
@@ -101,12 +102,12 @@ body .text-d, body.text-danger {
   border-color: #6c757d;
 }
 .label.label-iwb {
-  background-color: #11998e;
-  border-color: #11998e;
+  background-color: #03aebc;
+  border-color: #03aebc;
 }
 .label.label-p, .label.label-primary {
-  background-color: #11998e;
-  border-color: #11998e;
+  background-color: #03aebc;
+  border-color: #03aebc;
 }
 .label.label-s, .label.label-success {
   background-color: #28a745;
@@ -128,14 +129,14 @@ body .text-d, body.text-danger {
 
 .badge.badge-iwb {
   color: #fff;
-  background-color: #11998e;
-  border-color: #11998e;
+  background-color: #03aebc;
+  border-color: #03aebc;
 }
 
 .btn.btn-iwb {
   color: #fff;
-  background-color: #11998e;
-  border-color: #11998e;
+  background-color: #03aebc;
+  border-color: #03aebc;
   box-shadow: none;
 }
 
@@ -145,19 +146,19 @@ body .text-d, body.text-danger {
 }
 
 .btn.btn-default {
-  color: #11998e;
-  border-color: #11998e;
+  color: #03aebc;
+  border-color: #03aebc;
 }
 
 .btn-outline-iwb {
-  color: #11998e;
-  border-color: #11998e;
+  color: #03aebc;
+  border-color: #03aebc;
 }
 
 .btn-outline-iwb:hover {
   color: #fff;
-  background-color: #11998e;
-  border-color: #11998e;
+  background-color: #03aebc;
+  border-color: #03aebc;
 }
 
 .btn.btn-gold {
@@ -189,7 +190,7 @@ body .text-d, body.text-danger {
 
 .bg-iwb {
   color: #fff;
-  background-color: #11998e !important;
+  background-color: #03aebc !important;
 }
 .bg-iwb > a {
   color: inherit !important;
@@ -220,17 +221,17 @@ body .text-d, body.text-danger {
 }
 
 .card.card-iwb.card-outline {
-  border-top: 3px solid #11998e;
+  border-top: 3px solid #03aebc;
 }
 .card.card-iwb:not(.card-outline) > .card-header {
-  background-color: #11998e;
+  background-color: #03aebc;
   color: #fff !important;
 }
 .card.card-iwb:not(.card-outline) > .card-header a.nav-link {
   color: inherit !important;
 }
 .card.card-iwb:not(.card-outline) > .card-header a.nav-link.active {
-  color: #11998e !important;
+  color: #03aebc !important;
   background: #fff;
   border-color: #fff;
 }
@@ -276,7 +277,7 @@ body .text-d, body.text-danger {
   display: inline-block;
   position: relative;
   padding-left: 30px;
-  color: #11998e;
+  color: #03aebc;
   margin-bottom: 10px;
   cursor: pointer;
   font-size: 0.875rem;
@@ -339,19 +340,19 @@ body .text-d, body.text-danger {
 }
 
 .tooltip .tooltip-inner {
-  background: #11998e;
+  background: #03aebc;
 }
 .tooltip.bs-tooltip-left .arrow:before {
-  border-left-color: #11998e;
+  border-left-color: #03aebc;
 }
 .tooltip.bs-tooltip-right .arrow:before {
-  border-right-color: #11998e;
+  border-right-color: #03aebc;
 }
 .tooltip.bs-tooltip-top .arrow:before {
-  border-top-color: #11998e;
+  border-top-color: #03aebc;
 }
 .tooltip.bs-tooltip-bottom .arrow:before {
-  border-bottom-color: #11998e;
+  border-bottom-color: #03aebc;
 }
 
 .daterangepicker {
@@ -431,7 +432,7 @@ body .text-d, body.text-danger {
 
 .dropdown-menu .dropdown-item:active, .dropdown-menu .dropdown-item.active {
   color: #fff !important;
-  background-color: #11998e;
+  background-color: #03aebc;
 }
 
 .modal-backdrop.show {
@@ -439,7 +440,7 @@ body .text-d, body.text-danger {
 }
 
 .modal .modal-header {
-  color: #11998e;
+  color: #03aebc;
   padding-top: 10px;
   padding-bottom: 10px;
 }
@@ -455,10 +456,10 @@ body .text-d, body.text-danger {
   padding-bottom: 10px;
 }
 .modal .dropdown-menu {
-  border-color: #11998e;
+  border-color: #03aebc;
 }
 .modal .dropdown-menu .dropdown-item {
-  color: #11998e;
+  color: #03aebc;
   border-bottom: 1px solid #eee;
 }
 .modal .dropdown-menu .dropdown-item:first-child {
@@ -466,12 +467,12 @@ body .text-d, body.text-danger {
 }
 .modal .dropdown-menu .dropdown-item:active, .modal .dropdown-menu .dropdown-item.active {
   color: #fff !important;
-  background-color: #11998e;
+  background-color: #03aebc;
 }
 .modal .dropdown-menu .dropdown-item:focus, .modal .dropdown-menu .dropdown-item:hover {
   color: #fff;
   text-decoration: none;
-  background-color: #11998e;
+  background-color: #03aebc;
 }
 
 form .form-group {
@@ -496,7 +497,7 @@ form .form-control {
   z-index: 1;
 }
 form .form-control:focus, form .form-control:active {
-  border-color: #11998e;
+  border-color: #03aebc;
 }
 form .form-control:disabled, form .form-control[readonly] {
   background-color: #e9ecef;
@@ -521,8 +522,8 @@ form .search-input + label.error {
 }
 form .input-group > .search-icon > .input-group-text {
   color: #fff;
-  background-color: #11998e;
-  border: 1px solid #11998e;
+  background-color: #03aebc;
+  border: 1px solid #03aebc;
   font-weight: 400;
   width: 35px;
 }
@@ -544,8 +545,8 @@ form .input-group > .search-icon > .input-group-text {
 }
 .input-group-sm .select2-container .selection > .select2-selection--multiple .select2-selection__choice {
   margin-top: 0.325rem;
-  background-color: #11998e;
-  border-color: #11998e;
+  background-color: #03aebc;
+  border-color: #03aebc;
   font-size: 85%;
 }
 .input-group-sm .select2-container .selection > .select2-selection--multiple .select2-selection__choice__remove {
@@ -555,14 +556,14 @@ form .input-group > .search-icon > .input-group-text {
   color: #fff;
 }
 .input-group-sm .select2-container.select2-container--focus .select2-selection, .input-group-sm .select2-container.select2-container--open .select2-selection {
-  border-color: #11998e;
+  border-color: #03aebc;
 }
 .input-group-sm .select2-container.select2-container--open .select2-search--inline .select2-search__field {
-  border: 1px solid #11998e;
+  border: 1px solid #03aebc;
   margin-top: 4px;
 }
 .input-group-sm .select2-container .select2-dropdown {
-  border-color: #11998e;
+  border-color: #03aebc;
 }
 .input-group-sm .form-control.error + .select2-container .select2-selection {
   border-color: #dc3545;
@@ -594,14 +595,14 @@ form .input-group > .search-icon > .input-group-text {
 }
 .iwb-bootstrap-table .table-action {
   cursor: pointer;
-  color: #11998e;
+  color: #03aebc;
   margin: 0 8px;
   padding: 0 2px;
   font-size: 14px;
   font-weight: 600;
 }
 .iwb-bootstrap-table .table-action:hover {
-  border-bottom: 2px solid #11998e;
+  border-bottom: 2px solid #03aebc;
   padding-bottom: 2px;
 }
 .iwb-bootstrap-table .table-action i {
@@ -625,7 +626,7 @@ form .input-group > .search-icon > .input-group-text {
 }
 .iwb-bootstrap-table .fixed-table-container .fixed-table-header thead {
   /*background-color: #D1DCF9;*/
-  background-color: #11998e;
+  background-color: #03aebc;
   background-image: linear-gradient(rgba(255, 255, 255, 0.5), rgba(255, 255, 255, 0.5));
 }
 .iwb-bootstrap-table .fixed-table-container .fixed-table-header thead .th-inner.sortable {
@@ -639,12 +640,12 @@ form .input-group > .search-icon > .input-group-text {
   background-color: rgba(0, 0, 0, 0);
 }
 .iwb-bootstrap-table .fixed-table-container .fixed-table-body thead {
-  background-color: #11998e;
+  background-color: #03aebc;
   background-image: linear-gradient(rgba(255, 255, 255, 0.5), rgba(255, 255, 255, 0.5));
   /*background-color: #EBEEF7;*/
 }
 .iwb-bootstrap-table .fixed-table-container .fixed-table-body tbody .selected td {
-  background-color: #109085;
+  background-color: #03a5b2;
   /*background-color: #0074f0;*/
   color: #eee;
 }
@@ -658,12 +659,12 @@ form .input-group > .search-icon > .input-group-text {
 }
 .iwb-bootstrap-table .fixed-table-container .fixed-table-body .table-hover > tbody > tr:hover {
   /*background-color: #D1DCF9;*/
-  background-color: #11998e;
+  background-color: #03aebc;
   background-image: linear-gradient(rgba(255, 255, 255, 0.5), rgba(255, 255, 255, 0.5));
 }
 .iwb-bootstrap-table .fixed-table-pagination {
   /*background-color: #D1DCF9;*/
-  background-color: #11998e;
+  background-color: #03aebc;
   background-image: linear-gradient(rgba(255, 255, 255, 0.5), rgba(255, 255, 255, 0.5));
   padding: 5px;
   border: 1px solid #ddd;
@@ -685,14 +686,14 @@ form .input-group > .search-icon > .input-group-text {
 .search-card > .card-header .card-title {
   font-size: 0.875rem;
   line-height: 21px;
-  color: #11998e;
+  color: #03aebc;
 }
 .search-card > .card-header .card-tool {
   position: absolute;
   right: 3px;
 }
 .search-card > .card-header .card-tool i, .search-card > .card-header .card-tool span {
-  color: #11998e;
+  color: #03aebc;
 }
 .search-card > .card-body {
   padding: 10px 10px 0;
@@ -711,8 +712,8 @@ form .input-group > .search-icon > .input-group-text {
   min-width: 20px;
   text-align: right;
   color: #fff;
-  background-color: #11998e;
-  border: 1px solid #11998e;
+  background-color: #03aebc;
+  border: 1px solid #03aebc;
   font-weight: bold;
 }
 .search-card .search-unit .select2 {
@@ -760,11 +761,12 @@ form .input-group > .search-icon > .input-group-text {
   margin: 0;
   padding: 10px 0 0;
   text-indent: 1em;
+  color: #36536D;
 }
 .swal-modal .swal-title {
   font-size: 16px;
   font-weight: 600;
-  color: #333;
+  color: #094B88;
   line-height: 35px;
 }
 .swal-modal .swal-title:before {
@@ -792,33 +794,33 @@ form .input-group > .search-icon > .input-group-text {
 }
 .swal-modal .swal-footer {
   text-align: right;
-  margin-top: 0px;
+  margin-top: 10px;
   padding: 5px 10px;
 }
 .swal-modal .swal-footer .swal-button-container {
   margin: 0;
 }
 .swal-modal .swal-footer .swal-button-container .swal-button {
-  background-color: #0074f0;
-  border: 1px solid #0074f0;
+  border: 1px solid #03AEBC;
+  background: #03AEBC;
   color: #fff;
   border-radius: 3px;
   box-shadow: none;
-  font-weight: 600;
+  font-weight: 400;
   font-size: 14px;
   padding: 4px 20px;
   margin-left: 15px;
   cursor: pointer;
 }
 .swal-modal .swal-footer .swal-button-container .swal-button.swal-button--cancel {
-  color: #0074f0;
-  background-color: #fff;
-  border: 1px solid #0074f0;
+  background: #F5F5F5;
+  color: #36536D;
+  border: 1px solid #F3F3F3;
 }
 
 .iwb-info-box .box-header {
   text-indent: 2em;
-  color: #11998e;
+  color: #03aebc;
   margin-top: 15px;
   margin-bottom: 15px;
   font-size: 1.5rem;
@@ -828,7 +830,7 @@ form .input-group > .search-icon > .input-group-text {
   padding-bottom: 10px;
 }
 .iwb-info-box .box-footer {
-  color: #11998e;
+  color: #03aebc;
   text-align: center;
   background: transparent;
   margin-top: 15px;
@@ -868,7 +870,7 @@ form .input-group > .search-icon > .input-group-text {
   padding: 0 15px 0 0;
 }
 .notification-menu .notification-item .item-state .no-read {
-  color: #11998e;
+  color: #03aebc;
   cursor: pointer;
   position: relative;
 }
@@ -929,7 +931,7 @@ form .input-group > .search-icon > .input-group-text {
   box-shadow: inset 0 0 5px rgba(0, 0, 0, 0.25);
   background-color: #f6f6f6;
   background-color: #f6f6f6;
-  border: 1px solid #11998e;
+  border: 1px solid #03aebc;
   overflow: hidden;
 }
 #avatar-modal .avatar-wrapper img {

App/Relese/Content/Image/ExerciseV2/toggle.svg

@@ -0,0 +1,5 @@
+<svg width="40" height="40" viewBox="0 0 40 40" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M31.2956 18.5912H8.70478C7.76468 18.5912 7.00195 17.8285 7.00195 16.8884C7.00195 15.9483 7.76468 15.1855 8.70478 15.1855H31.2956C32.2357 15.1855 32.9984 15.9483 32.9984 16.8884C32.9984 17.8285 32.2357 18.5912 31.2956 18.5912Z" fill="white"/>
+<path d="M8.70478 18.591C8.26843 18.591 7.83208 18.4243 7.50216 18.0908C6.83522 17.4239 6.83522 16.349 7.50216 15.6821L13.8842 9.30001C14.5511 8.63307 15.626 8.63307 16.293 9.30001C16.9599 9.96695 16.9599 11.0419 16.293 11.7088L9.9074 18.0944C9.57748 18.4279 9.14113 18.591 8.70478 18.591ZM31.2956 25.8351H8.70478C7.76468 25.8351 7.00195 25.0724 7.00195 24.1323C7.00195 23.1922 7.76468 22.4295 8.70478 22.4295H31.2956C32.2357 22.4295 32.9984 23.1922 32.9984 24.1323C32.9984 25.0724 32.2357 25.8351 31.2956 25.8351Z" fill="white"/>
+<path d="M24.9138 32.2141C24.4774 32.2141 24.0411 32.0474 23.7111 31.7139C23.0442 31.0469 23.0442 29.9685 23.7111 29.3051L30.0932 22.9231C30.7601 22.2561 31.835 22.2561 32.502 22.9231C33.1689 23.59 33.1689 24.6685 32.502 25.3318L26.1164 31.7174C25.7829 32.0509 25.3501 32.2141 24.9138 32.2141Z" fill="white"/>
+</svg>

App/Relese/Content/Image/ExerciseV2/wait_zhb.svg

@@ -0,0 +1,3 @@
+<svg width="92" height="92" viewBox="0 0 92 92" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M67.9888 72.4037C68.5516 72.0257 69.0651 71.6519 69.5334 71.1836L88.4217 52.3036C90.0876 50.6286 91.0228 48.3623 91.0228 45.9999C91.0228 43.6376 90.0876 41.3713 88.4217 39.6963L69.5334 20.808C67.8586 19.1433 65.5932 18.209 63.2318 18.209C60.8705 18.209 58.6051 19.1433 56.9303 20.808L50.3206 27.4177L58.29 35.383C59.6826 36.7726 60.7875 38.4233 61.5413 40.2406C62.2952 42.0578 62.6832 44.0058 62.6832 45.9732C62.6832 47.9406 62.2952 49.8887 61.5413 51.7059C60.7875 53.5231 59.6826 55.1738 58.29 56.5635C57.7141 57.128 56.9398 57.4442 56.1333 57.4442C55.3269 57.4442 54.5526 57.128 53.9767 56.5635C53.4122 55.9876 53.096 55.2133 53.096 54.4068C53.096 53.6004 53.4122 52.8261 53.9767 52.2501C55.6413 50.5754 56.5757 48.3099 56.5757 45.9486C56.5757 43.5872 55.6413 41.3218 53.9767 39.647L46.0073 31.6776L35.0966 20.8121C34.9076 20.6232 34.768 20.4835 34.579 20.3438C32.8717 18.8916 30.6814 18.1334 28.4417 18.2194C26.202 18.3053 24.0762 19.2292 22.4852 20.808L3.60107 39.6922C1.93515 41.3671 1 43.6335 1 45.9958C1 48.3582 1.93515 50.6245 3.60107 52.2994L22.4852 71.1836C24.1602 72.8495 26.4265 73.7847 28.7889 73.7847C31.1512 73.7847 33.4175 72.8495 35.0925 71.1836L41.6981 64.5288L33.7328 56.5635C32.3402 55.1738 31.2353 53.5231 30.4815 51.7059C29.7276 49.8887 29.3396 47.9406 29.3396 45.9732C29.3396 44.0058 29.7276 42.0578 30.4815 40.2406C31.2353 38.4233 32.3402 36.7726 33.7328 35.383C34.3087 34.8185 35.083 34.5023 35.8894 34.5023C36.6959 34.5023 37.4702 34.8185 38.0461 35.383C38.6106 35.9589 38.9268 36.7332 38.9268 37.5396C38.9268 38.3461 38.6106 39.1204 38.0461 39.6963C36.3814 41.3711 35.4471 43.6365 35.4471 45.9979C35.4471 48.3592 36.3814 50.6247 38.0461 52.2994L56.9303 71.1836C58.3689 72.599 60.2421 73.489 62.2481 73.7103C64.2541 73.9316 66.2762 73.4714 67.9888 72.4037Z" fill="white"/>
+</svg>

App/Relese/Content/Image/ExerciseV2/zhb/zh_icon-JY2012000010101.svg

@@ -0,0 +1,7 @@
+<svg width="50" height="50" viewBox="0 0 50 50" fill="none" xmlns="http://www.w3.org/2000/svg">
+  <g opacity="0.9">
+    <path
+      d="M37.127 33.6343C37.4732 33.9976 38.1524 35.6592 37.1407 36.6875C36.9434 36.8923 36.707 37.0555 36.4454 37.1673C36.1839 37.2791 35.9026 37.3373 35.6182 37.3384H35.5958C35.2975 37.334 35.0031 37.2699 34.73 37.1498C34.457 37.0297 34.2108 36.856 34.0059 36.6392C28.9073 31.3135 23.7032 25.9033 18.5318 20.5601C16.9053 18.875 16.1231 18.0498 15.4332 17.3223C14.6007 16.4434 13.8814 15.686 11.9742 13.7227C11.8453 13.5884 11.7237 13.4521 11.6065 13.3208C11.4341 13.1255 11.2711 12.9434 11.0967 12.7788C10.7003 12.4009 10.1763 11.8169 10.1832 11.0967C10.1876 10.6084 10.4371 10.1309 10.9244 9.68066C11.6046 9.04883 12.7081 8.5918 14.0928 10.0132C17.1724 13.1543 18.9864 15.0303 20.9063 17.0161C22.4312 18.5933 24.0089 20.2246 26.3751 22.6538C28.3326 24.6504 29.8848 26.2378 31.3853 27.7729C33.1666 29.5947 34.8492 31.3154 37.1192 33.6284L37.127 33.6343ZM16.8687 22.1631C16.003 21.29 15.1597 21.272 14.6461 22.6958C13.7799 25.1055 12.7799 27.4692 11.8834 29.8794C11.1812 31.7759 11.605 32.3936 13.6163 32.4185C16.2574 32.4487 18.8922 32.4243 21.733 32.4243C20.3697 36.7793 19.0679 40.8613 17.7589 44.9629C17.5533 45.5923 17.4625 46.1797 18.0616 46.5254C18.5709 46.8213 19.0557 46.5073 19.4429 46.0835C22.4166 42.8579 25.3866 39.6291 28.3531 36.397C29.129 35.5493 29.0987 34.6709 28.3111 33.8652C24.5201 29.9424 20.706 26.0417 16.8687 22.1631ZM37.5425 20.166C35.5626 20.1602 33.6119 20.166 31.2676 20.166C31.9024 19.0762 32.3453 18.2573 32.8179 17.4155C34.8472 13.9268 36.9005 10.4331 38.9112 6.91748C39.8023 5.36768 39.5113 4.72021 37.961 4.71436C32.3272 4.68994 26.7056 4.71436 21.0792 4.68994C20.3336 4.68994 19.9337 4.88525 19.7398 5.70752C19.4376 7.04541 18.9703 8.354 18.5528 9.65723C18.3521 10.269 18.3653 10.771 18.8555 11.292C23.3751 16.1562 27.8796 21.0358 32.3692 25.9307C33.066 26.6929 34.0108 26.7544 34.5865 26.269C36.0777 25.0021 37.4579 23.61 38.712 22.1079C39.5289 21.1201 38.8814 20.1699 37.5425 20.166Z"
+      fill="white" />
+  </g>
+</svg>

App/Relese/Content/Image/ExerciseV2/zhb/zh_icon-JY2012000010102.svg

@@ -0,0 +1,3 @@
+<svg width="50" height="50" viewBox="0 0 50 50" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M37.6758 25.3988C36.0125 21.8952 30.0267 18.0423 30.0267 18.0423L27.3643 36.2573C27.3643 36.2573 24.0377 33.4557 24.0377 32.0549C23.7057 29.9522 28.6955 18.0423 28.6955 18.0423L25.369 19.0936L21.3784 18.0423C17.72 18.3917 9.73571 28.2004 8.40453 31.7039C7.40843 34.8566 8.40453 38.7095 9.73571 39.4099C12.0646 40.8106 17.0528 40.4613 17.0528 40.4613L16.501 45.7909H34.5627L33.5003 33.5822C33.5003 33.5822 35.0148 37.6581 35.3484 39.7608C35.6805 41.8621 35.6252 45.7909 35.6252 45.7909H41.9953C41.9806 45.4669 41.9196 43.9322 41.6662 39.4099C41.3342 33.4558 39.671 29.2518 37.6758 25.3988ZM24.7034 38.36C24.3714 38.7095 21.3784 39.0589 18.384 39.0589C15.3895 39.0589 12.0646 39.0589 11.399 38.36C10.7349 37.6581 9.40372 36.6083 10.0678 33.8066C10.0678 29.9522 17.72 21.8952 18.384 21.1948C18.384 21.1948 22.3745 31.3529 23.3737 33.1047C24.3714 34.8566 25.3689 35.9063 25.3689 35.9063C25.3689 35.9063 25.369 37.6581 24.7034 38.36ZM41.9953 45.7909C41.9999 45.8936 41.9999 45.875 41.9999 45.7909H41.9953ZM25.6378 16.6999C29.6093 16.6999 32.8283 13.4398 32.8283 9.41769C32.8283 5.39716 29.6093 2.13867 25.6378 2.13867C21.6647 2.13867 18.4441 5.39716 18.4441 9.41769C18.4441 13.4398 21.6647 16.6999 25.6378 16.6999Z" fill="white"/>
+</svg>

App/Relese/Content/Image/tittle_logo.svg

@@ -0,0 +1,6 @@
+<svg width="80" height="80" viewBox="0 0 80 80" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M69.8499 31.4267C71.1825 30.927 72.6485 31.5933 73.1482 32.926C73.1815 32.9926 73.1815 33.0592 73.2148 33.1259C74.0478 36.0577 74.4809 39.1229 74.4809 42.1547C74.4809 60.4122 59.6884 75.1714 41.4643 75.1714C30.0701 75.1714 20.0086 69.3743 14.0783 60.6121C12.8789 58.8463 13.6452 56.4142 15.6441 55.6812L18.9092 54.4485C20.5083 53.8488 22.3074 54.3819 23.3402 55.7479C27.4715 61.2451 34.0681 64.81 41.4643 64.81C53.9913 64.81 64.1195 54.6817 64.1195 42.1547C64.1195 41.3551 64.0862 40.5888 63.9862 39.8225L39.7319 57.447C38.3992 58.4132 36.5002 57.447 36.5668 55.7812L36.9 43.8871L35.2342 44.5202L20.2418 50.184L10.5467 53.8488L8.88092 54.4818C7.68153 54.9483 6.81531 53.3157 7.84811 52.5495L9.68052 51.2168L16.5104 46.2526L18.9092 44.5202L26.472 38.9896C33.1352 34.1587 39.4654 29.561 43.1302 26.8623C44.4628 25.8962 46.3285 26.8957 46.2952 28.5282L45.9287 40.4555L47.9943 39.6892C47.9943 39.6892 54.9908 37.0572 62.6202 34.1587L65.752 32.9926L69.8499 31.4267Z" fill="#316EF3"/>
+<path d="M35.2342 44.5202L36.9 43.8871L45.9287 40.4555L46.2952 28.5282C46.3285 26.8957 44.4628 25.8962 43.1302 26.8623C39.4654 29.561 33.1352 34.1587 26.472 38.9896L18.9091 44.5202L16.5104 46.2526L9.68052 51.2168L7.84811 52.5495C6.81531 53.3157 7.68153 54.9483 8.88092 54.4818L10.5467 53.8488L20.2418 50.184L35.2342 44.5202Z" fill="#316EF3"/>
+<path d="M67.2511 16.5C59.3884 7.07144 47.0947 2.80691 35.0342 4.50606C24.7394 5.97199 15.4108 12.5354 10.2135 21.4975C7.14836 26.8282 5.54917 32.8918 5.51586 39.0221C5.48254 41.6208 7.81468 44.1528 10.5133 44.0196C13.2453 43.8863 15.4774 41.8207 15.5108 39.0221C15.5108 37.9226 15.5774 36.8565 15.6773 35.7904C15.7107 35.5905 15.8439 34.8242 15.6773 35.757C15.7107 35.5238 15.744 35.3239 15.7773 35.0907C15.8772 34.491 16.0105 33.9246 16.1438 33.3249C16.377 32.3254 16.6768 31.3259 17.0433 30.3264C17.1433 30.0599 17.643 28.7939 17.2765 29.6601C17.5097 29.127 17.743 28.594 18.0095 28.0609C18.4759 27.1614 18.9757 26.2618 19.5087 25.3956C19.7753 24.9625 20.0751 24.5627 20.375 24.1295C20.5082 23.963 20.6415 23.7631 20.7748 23.5965C20.2084 24.3628 20.8081 23.5632 20.9413 23.3966C22.3073 21.7974 23.7732 20.2981 25.439 18.9988C24.7061 19.5985 25.7722 18.7656 26.0054 18.599C26.4385 18.2991 26.8383 18.0326 27.2714 17.7661C28.2043 17.1997 29.1705 16.6666 30.17 16.2002C30.4365 16.0669 31.6359 15.5672 30.803 15.9003C31.2694 15.7004 31.7692 15.5339 32.2689 15.3673C33.335 15.0008 34.4011 14.7009 35.5006 14.4677C36.0003 14.3678 36.5334 14.2678 37.0665 14.1679C37.6661 14.0679 36.9332 14.1679 36.8666 14.2012C37.1664 14.1679 37.4663 14.1346 37.7661 14.1012C38.9655 14.0013 40.1649 13.968 41.3643 14.0013C43.9629 14.0679 45.2623 14.2678 48.0275 15.1341C48.6939 15.334 49.3269 15.5672 49.9599 15.8004C50.0598 15.8337 50.8261 16.1669 50.1598 15.867C50.4596 16.0003 50.7595 16.1336 51.0926 16.3001C52.292 16.8998 53.4581 17.5662 54.5909 18.2991C54.8574 18.499 55.1239 18.6656 55.4238 18.8655C55.557 18.9655 55.6903 19.0654 55.8236 19.1654C55.557 18.9322 55.5237 18.9321 55.7903 19.132C56.3233 19.5318 56.8231 19.9983 57.3228 20.4314C58.3556 21.3976 59.3218 22.4304 60.2546 23.5298C61.9871 25.5955 65.5186 25.3289 67.3177 23.5298C69.3167 21.5308 68.9835 18.5657 67.2511 16.5Z" fill="#01A4FF"/>
+<path d="M27.209 34.3545C29.785 34.3545 31.8733 32.2662 31.8733 29.6902C31.8733 27.1142 29.785 25.0259 27.209 25.0259C24.633 25.0259 22.5447 27.1142 22.5447 29.6902C22.5447 32.2662 24.633 34.3545 27.209 34.3545Z" fill="#00E0FF"/>
+</svg>

App/Relese/Content/Scss/ExerciseV2/_stu-form.scss

@@ -17,6 +17,7 @@
         background-image: linear-gradient(rgba(0, 0, 0, 0.1), rgba(0, 0, 0, 0.1));
         border-color: rgba(0, 0, 0, 0.1);
         color: #DAEDFF;
+        font-weight:600;
     }
 }
 

App/Relese/Content/Scss/ExerciseV2/screen.scss

@@ -31,7 +31,7 @@ body {
 }
 
 .box {
-    margin:0 10px;
+    margin: 0 10px;
     font-size: 1.25rem;
 
     > .box {
@@ -171,6 +171,22 @@ body {
             }
         }
 
+        .guide-box {
+            margin:10px 0;
+            padding: 10px;
+            background: var(--bg);
+            border-radius: 5px;
+
+            p {
+                margin: 0;
+                font-size: 13px;
+            }
+
+            .guide-title {
+                font-weight: 600;
+            }
+        }
+
         .desc {
             padding: 8px;
             color: #36536D;
@@ -382,6 +398,13 @@ body {
                 font-weight: 400;
             }
         }
+
+        &.system-score {
+            .name {
+                font-size: 16px;
+                font-weight: 600;
+            }
+        }
     }
 
     &.plan-box {
@@ -431,9 +454,36 @@ body {
     }
 }
 
-#modal-role-plan {
-    .modal-title-span{
-        color:var(--tc);
+.modal {
+    .modal-header {
+        color: var(--tc);
+
+        .modal-title-span {
+        }
+
+        .close {
+            font-size: 30px;
+        }
+    }
+
+    .modal-footer {
+        margin: 0 auto;
+
+        .btn-outline-iwb {
+            background: #F5F5F5;
+            color: #36536D;
+            border: 1px solid #F3F3F3;
+        }
+
+        .btn-iwb {
+            margin: 0 15px;
+            padding: 8px 20px;
+            background: #03AEBC;
+            border-color: #03AEBC;
+            border-radius: 8px;
+            color: #DAEDFF;
+            font-size: 16px;
+        }
     }
 }
 

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

@@ -52,7 +52,7 @@
             position: absolute;
             left: 15px;
             bottom: 15px;
-            width: 300px;
+            width: 70%;
         }
     }
 }

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

@@ -16,53 +16,64 @@
         }
     }
 
-    .table-box {
-        display: block;
+    .logs-box {
+        width: 100%;
+        display: flex;
+        flex-direction: column;
 
-        tr {
-            border-top: 1px solid #36536d;
-
-            &:nth-of-type(2n+1) {
-                background: linear-gradient(rgba(0,0,0,.02),rgba(0,0,0,.02))
-            }
-
-            &.empty td {
-                padding: 8px;
+        .log-box {
+            display: flex;
+            padding: 10px;
+            background: rgba(255, 255, 255, 0.6);
+            border-radius: 8px;
+            margin: 5px 0;
+
+            .content {
+                width: 100%;
+                display: flex;
+                flex-direction: column;
+                padding: 5px;
+                padding-right: 15px;
+
+                .title {
+                    font-weight: 600;
+                    color: #03AEBC;
+                    font-size: 14px;
+                }
+
+                .text {
+                    color: #36536D;
+                }
             }
-        }
-
-        th {
-            color: #fff;
-            background: #4585cc;
-            text-align: center;
-        }
 
-        td {
-            color: #36536d;
-            text-align: center;
-            padding: 6px 10px;
-        }
+            .btn-box {
+                display: flex;
+                justify-content: center;
+                align-items: center;
+                padding: 5px;
 
-        .state {
-            border: 1px solid #4585cc;
-            border-radius: 5px;
-            font-size: 12px;
-            padding: 2px 5px;
-            color: #4585cc;
-        }
+                .btn {
+                    font-size: 14px;
+                    width: 90px;
+                }
+            }
 
-        .btn {
-            background: #4585cc;
-            border-radius: 20px;
-            padding: 2px 15px;
-            color: #eee;
+            &.send {
+                .btn {
+                    background: #DE5E5E;
+                }
+            }
         }
 
-        .send {
-            .state {
-                background: #4585cc;
-                color: #fff;
-            }
+        .empty {
+            width: 100%;
+            height:100%;
+            display: flex;
+            justify-content: center;
+            align-items: center;
+            color: #36536D;
+            font-size:16px;
+            opacity:.4;
         }
     }
 }

App/Relese/Content/Scss/style.scss

@@ -1,5 +1,6 @@
 /*$main-color: #007bff;*/
-$main-color: #11998e;
+/*$main-color: #11998e;*/
+$main-color: #03aebc;
 
 @mixin dropdownItem {
     border-color: $main-color;
@@ -940,12 +941,13 @@ form {
         margin: 0;
         padding: 10px 0 0;
         text-indent: 1em;
+        color: #36536D;
     }
 
     .swal-title {
         font-size: 16px;
         font-weight: 600;
-        color: #333;
+        color: #094B88;
         line-height: 35px;
 
         &:before {
@@ -987,28 +989,28 @@ form {
 
     .swal-footer {
         text-align: right;
-        margin-top: 0px;
+        margin-top: 10px;
         padding: 5px 10px;
 
         .swal-button-container {
             margin: 0;
 
             .swal-button {
-                background-color: #0074f0;
-                border: 1px solid #0074f0;
+                border: 1px solid #03AEBC;
+                background: #03AEBC;
                 color: #fff;
                 border-radius: 3px;
                 box-shadow: none;
-                font-weight: 600;
+                font-weight: 400;
                 font-size: 14px;
                 padding: 4px 20px;
                 margin-left: 15px;
                 cursor: pointer;
 
                 &.swal-button--cancel {
-                    color: #0074f0;
-                    background-color: #fff;
-                    border: 1px solid #0074f0;
+                    background: #F5F5F5;
+                    color: #36536D;
+                    border: 1px solid #F3F3F3;
                 }
             }
         }

App/Relese/Resources/Guids.iwbx

@@ -1,8 +0,0 @@
-<Guids>
-  <Guid type="DataLib" step="1" last-id="20101" last-date="2024/6/14 14:56:27">
-  </Guid>
-  <Guid type="UserNo" step="1" last-id="10001" last-date="1900/1/1 0:00:00">
-  </Guid>
-  <Guid type="Guest" step="1" last-id="10001" last-date="1900/1/1 0:00:00">
-  </Guid>
-</Guids>

App/Relese/Views/ExerciseV2/Enter.cshtml

@@ -12,9 +12,6 @@
 }
 @section styles{
     <link href="~/Content/Css/ExerciseV2/stu-bg.min.css" rel="stylesheet" />
-    <style>
-    </style>
-
 }
 @Html.Partial("Layout/V2/_Bg",true)
 <div class="box no-select" style="">

App/Relese/Views/ExerciseV2/Headquarter.cshtml

@@ -82,7 +82,7 @@
         </div>
     </div>
     
-  
+    <div style="position: absolute; left: 0; bottom: 0; color: #ddd; opacity: 0.5;">@(groupName)</div>
 </div>
 
 @section scripts
@@ -189,7 +189,7 @@
             var str = '';
             if (data) {
                 str += '<div class="select-item" id="t_{0}" data-id="{0}" onclick="GroupToggle(this)">'.format(data.id);
-                str += '<div class="check-box-icon @(stu)"></div>';
+                str += '<div class="check-box-icon @(stu)" data-id="{0}" onclick="GroupCheckToggle(this)"></div>'.format(data.id);
                 str += '<div class="icon"><img data-id="{0}" src="/Content/Image/ExerciseV2/zhb/zh_icon-{0}.svg"/></div >'
                     .format(data.id);
                 str += '<span class="text">{0}</span>'.format(data.roleGroupName);
@@ -218,6 +218,9 @@
         }
 
         function GroupToggle(that) {
+            var e = window.event;
+            e.stopPropagation();
+            e.preventDefault();
             var $that = $(that);
             var id = $that.data('id');
             $('.role-content').removeClass('active');
@@ -227,6 +230,9 @@
         }
 
         function GroupCheckToggle(that) {
+            var e = window.event;
+            e.stopPropagation();
+            e.preventDefault();
             var $that = $(that);
             var id = $that.data('id');
             if ($('#t_' + id).hasClass('check')) {

App/Relese/Views/ExerciseV2/Index.cshtml

@@ -1,95 +1,50 @@
 @{
     ViewBag.Title = "页面选择";
     Layout = "~/Views/Shared/Layout/_Layout.Stu.cshtml";
-
 }
 @section styles{
+
+    <link href="~/Content/Css/ExerciseV2/stu-bg.min.css" rel="stylesheet" />
     <style>
-        .main-box {
+        .box {
             width: 100vw;
             height: 100vh;
-            flex-direction: row;
             display: flex;
-            padding: 5px 15px;
-            margin: 0 auto;
-            font-size: 16px;
-            color: #fff;
-            /*background-image: url('../../Content/Image/home/bg.jpg');*/
-            background-image: linear-gradient(45deg,#005f61,#007f61);
-            /*background-image: linear-gradient(45deg,#005f61,#005f61);*/
-            background-size: 100% 100%;
-            background-repeat: no-repeat;
+            justify-content: center;
+            align-items: center;
         }
-
-        .link-box {
+        #bg_title {
+            position: absolute;
+            top: 0;
+        }
+        .btn-box {
+            width: 400px;
             display: flex;
             flex-direction: column;
-            /*align-self: center;*/
-            /*justify-content: center;*/
-            width: 100%;
-            max-width: 400px;
-            margin: 20vh auto 0;
-            padding: 0;
-            transition: .5s all ease-in;
         }
+        .btn-box .btn {
+            margin: 8px 0;
+            font-size: 16px!important;
+            padding: 10px;
 
-        .link {
-            list-style: none;
-            width: 100%;
         }
 
-            .link a {
-                display: block;
-                width: 100%;
-                padding: 8px;
-                margin: 10px auto;
-                border-radius: 5px;
-                color: #eee;
-                border: 1px solid;
-                border-color: inherit;
-                text-align: center;
-                font-size: 18px;
-                text-decoration: none;
-                transition: .5s color,font-weight,border-color,background ease-in;
-            }
-
-                .link a:hover {
-                    text-decoration: none;
-                    background: linear-gradient(rgba(0, 0, 0, .1), rgba(0, 0, 0, .1));
-                    color: #ff0;
-                    border-width: 2px;
-                    margin: 9px auto;
-                    font-weight: bold;
-                }
     </style>
-}
-<div class="main-box">
-    <ul class="link-box">
-        <li class="link">
-            <a href="@Url.Action("Select","ExerciseV2",new{id=4})">专家屏</a>
-        </li>
-        <li class="link">
-            <a href="@Url.Action("Select","ExerciseV2",new{id=3})">公共屏</a>
-        </li>
-        <li class="link">
-            <a href="@Url.Action("Select","ExerciseV2",new{id=1})">组员</a>
-        </li>
-        <li class="link">
-            <a href="@Url.Action("Select","ExerciseV2",new{id=2})">指挥长</a>
-        </li>
-        <li class="link">
-            <a href="@Url.Action("Play","ExerciseV2")">主屏</a>
-        </li>
-        <li class="link">
-            <a href="@Url.Action("Select","ExerciseV2",new{id=5})">手动记录演练情况</a>
-        </li>
-
-
-        @*<li class="link">
-            <a href="@Url.Action("SelectOrder","Main",new{id=4})">配置中心</a>
-        </li>*@
-
-    </ul>
-</div>
 
 
+}
+@Html.Partial("Layout/V2/_Bg", true)
+
+<div class="box">
+    <div id="bg_title">
+        <span class="title">页面中心</span>
+    </div>
+    <div class="btn-box">
+        <a class="btn" href="@Url.Action("Select", "ExerciseV2", new { id = 4 })">专家屏</a>
+        <a class="btn" href="@Url.Action("Select", "ExerciseV2", new { id = 3 })">公共屏</a>
+        <a class="btn" href="@Url.Action("Select", "ExerciseV2", new { id = 1 })">组员</a>
+        <a class="btn" href="@Url.Action("Select", "ExerciseV2", new { id = 2 })">指挥长</a>
+        <a class="btn" href="@Url.Action("Play", "ExerciseV2")">主屏</a>
+        <a class="btn" href="@Url.Action("Select", "ExerciseV2", new { id = 5 })">手动记录演练情况</a>
+    </div>
+</div>

App/Relese/Views/ExerciseV2/Leader.cshtml

@@ -10,8 +10,6 @@
 }
 @section css{
     <link href="~/Content/Css/ExerciseV2/stu-cmd_leader.min.css" rel="stylesheet" />
-    <style>
-    </style>
 }
 @Html.Partial("Layout/V2/_Bg",false)
 <div class="box  no-select" style="">
@@ -23,29 +21,18 @@
             <span class="title">@(groupName)指挥部 —— 指挥长</span>
         </div>
         <div class="body">
-            <div class="body-card  table-box">
-                <table class="table">
-                    <thead>
-                    <tr>
-                        <th style="width: 200px">角色</th>
-                        <th>指令内容</th>
-                        <th style="width: 80px">下达状态</th>
-                        <th style="width: 130px;">操作</th>
-                    </tr>
-                    </thead>
-                    <tbody id="log-box">
-                    <tr class="empty">
-                        <td colspan="5">暂无指令，等待组员发送指令</td>
-                    </tr>
-                    </tbody>
-                </table>
+            <div class="body-card" id="cmd-box">
+                <div id="log-box" class="logs-box">
+                    <div class='empty'>暂无指令，等待组员发送指令</div>
+                </div>
             </div>
             <div class="body-card">
-                <div class="btn" onclick="SubmitNextScene()">进入下一阶段情景</div>
+                <div class="btn" onclick="SubmitNextScene()">进入下一阶段场景</div>
             </div>
-           
+
         </div>
     </div>
+    <div style="position: absolute; left: 0; bottom: 0; color: #ddd; opacity: 0.5;">@(groupName)</div>
 </div>
 <div class="question" title="点击处理来电" onclick="ShowQuestion()">
     <button type="button" class="btn-danger" style="--w: 80px;">
@@ -95,8 +82,8 @@
             window.addEventListener('resize', resizeHeight_Leader);
             GetLog();
             GetQuestionLogs();
-          
-            OverlayScrollbar($('.leader-box'));
+
+            OverlayScrollbar($('#cmd-box'));
             $('#handleContent').keydown(function(e) {
                 var theEvent = window.event || e;
                 var code = theEvent.keyCode || theEvent.which || theEvent.charCode;
@@ -109,7 +96,7 @@
         function resizeHeight_Leader() {
             resizeHeight((h, wh) => {
                 var height = 225;
-                $(".table-box").height(wh - h - height)
+                $(".logs-box").height(wh - h - height)
             })
         }
 
@@ -117,22 +104,20 @@
             MsgConfirm("您确认下达这条指令吗？",
                 "下达指令",
                 function() {
-                    var $that = $(that).closest('tr');
+                    var $that = $(that).closest('.log-box');
                     var id = $that.data('id');
                     $.iwbAjax4({
                         url: abp.appUrl + "Eval/OperationScene?id=" + id,
                         success: function() {
-                            $that.removeClass('wait').addClass('send');
-                            $that.find('.state').html('已下达');
-                            $that.find('.action').html('');
-
+                            $that.addClass('send');
+                            $that.find('.btn').html('已下达');
                         }
                     });
                 });
         }
 
         function SubmitNextScene() {
-            var log = $("#log-box tr.send");
+            var log = $("#log-box .log-box.send");
             if (!log || log.length <= 0) {
                 abp.message.warn("请至少下达一条指令后再操作！");
                 return;
@@ -144,7 +129,7 @@
                     $.iwbAjax4({
                         url: abp.appUrl + "Eval/NextFlowNode?groupNo=@(id)&campNo=none",
                         success: function(res) {
-                            $("#log-box").html('<tr class="empty"><td colspan="5">暂无指令，等待组员发送指令</td></tr>');
+                            $("#log-box").html("<div class='empty'>暂无指令，等待组员发送指令</div>");
                         }
                     });
                 });
@@ -163,6 +148,9 @@
                         }
                         if (str) {
                             $("#log-box").html(str);
+                        } else {
+                            $("#log-box").html("<div class='empty'>暂无指令，等待组员发送指令</div>");
+
                         }
                     }
                 }
@@ -173,21 +161,9 @@
             var str = "";
             if (data) {
                 var msg = data.word ? data.word : "",
-                    btn = data.logState == '@(LogStateDefinition.New)'
-                        ? '<button type="button" class="btn btn-submit" style="" onclick="RoleHandle(this)">下达指令</button>'
-                        : '',
-                    state = data.logState == '@(LogStateDefinition.New)' ? '待下达' : '已下达',
-                    style = data.logState == '@(LogStateDefinition.New)' ? 'wait' : 'send';
-                str = '<tr class="{5}" data-id="{0}"><td>{1}</td><td>{2}</td><td><div class="state">{3}</div></td><td class="action">{4}</td></tr>'.format(
-                    data.id,
-                    data.role,
-                    msg,
-                    state,
-                    btn,
-                    style);
-                //str =
-                //    '<div class="handle-box leader {4}" data-id="{0}"> <div class="handle-content"><span class="role-text">{1}</span><span class="text">:</span><span class="content-text">{2}</span></div><div class="handle-button">{3}</div></div>'
-                //    .format(data.id, data.role, msg, btn, style);
+                    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);
             }
             return str;
         }
@@ -331,7 +307,7 @@
                     var data = JSON.parse(msg);
                     if (data) {
                         if (data.no == '@(id)') {
-                            $('tr.empty').remove();
+                            $('#log-box .empty').remove();
                             var str = FormatLog(data);
                             $('#log-box').prepend(str);
                         }

App/Relese/Views/ExerciseV2/Public.cshtml

@@ -10,9 +10,6 @@
     var model = new ScreenModel(1, id, campNo, true);
 }
 
-@*@section css{
-        <link href="~/Content/Css/Exercise/public.min.css" rel="stylesheet" />
-    }*@
 @Html.Partial("Camp/_Effect", id + "," + campNo)
 @Html.Partial("Layout/V2/_Bg",false)
 

App/Relese/Views/ExerciseV2/PublicWait.cshtml

@@ -12,7 +12,6 @@
 
 @section styles{
     <link href="~/Content/Css/ExerciseV2/stu-bg.min.css" rel="stylesheet" />
-
 }
 @Html.Partial("Layout/V2/_Bg",true)
 <div class="box public no-select" style="">
@@ -21,7 +20,14 @@
     </div>
     <div class="body ">
         <div class="icon">
-            <img class="ico" src="/Content/Image/ExerciseV2/wait_public.svg"  />
+            @if (group.CampGroupState == 102)
+            {
+                <img class="ico" src="/Content/Image/ExerciseV2/wait_zhb.svg" />
+            }
+            else
+            {
+                <img class="ico" src="/Content/Image/ExerciseV2/wait_public.svg" />
+            }
             @* <img class="img" src="/Content/Image/ExerciseV2/wait_timer.svg" /> *@
         </div>
         <div class="name">@(text)</div>

App/Relese/Views/ExerciseV2/Specialist.cshtml

@@ -44,7 +44,7 @@
 
     .carousel-indicators {
         margin: 0;
-        z-index: 0;
+        z-index: 10;
         position: relative;
         top: auto;
         bottom: auto;
@@ -53,49 +53,75 @@
         align-items: flex-end;
     }
 
-    .carousel-indicators li {
-        color: #fff;
-        display: flex;
-        height: 100%;
-        width: auto;
-        text-indent: 0;
-        background: none;
-        border-radius: 0;
-        margin: 0;
-        padding: 0;
-        border: none;
-        font-size: 60%;
-        margin: 0 25px
-    }
+        .carousel-indicators li {
+            color: #fff;
+            height: 100%;
+            width: auto;
+            text-indent: 0;
+            background: none;
+            border-radius: 0;
+            margin: 0;
+            padding: 0;
+            border: none;
+            position: relative;
+            display: none;
+            cursor: default;
+        }
 
-    .carousel-indicators li.active {
-        font-size: 100%;
-        display: flex;
-        margin: 0;
-        padding: 0;
-        border: none;
-    }
+        .carousel-indicators li.active {
+            display: flex;
+            font-size: 100%;
+            display: flex;
+            margin: 0;
+            padding: 0;
+            border: none;
+        }
+
+            .carousel-indicators li img {
+                cursor: pointer;
+                position: absolute;
+                width: 40px;
+                right: -50px;
+                top: 50%;
+                transform: translateY(-50%);
+            }
 
-    .carousel-inner {
-        width: 100%;
+    .groups {
+        position: absolute;
+        left: 50%;
+        transform: translateX(-50%);
+        top: 100%;
+        width: 300px;
+        padding: 5px 0;
+        display: none;
+        flex-direction: column;
+        background: #fff;
+        border: 1px solid rgba(255, 255, 255, 0.2);
+        border-radius: 8px;
+        z-index: 10;
     }
+        .groups .group {
+            font-size: 16px;
+            padding: 10px;
+            color: #36536D;
+            font-weight: 400;
+            cursor: pointer;
+        }
+            .groups .group.active {
+                background: rgba(9, 75, 136, 0.1);
+            }
+            .groups .group:hover {
+                font-weight: 600;
+            }
+            .carousel-inner {
+                width: 100%;
+            }
 
     .carousel, .carousel-inner, .carousel-item {
         position: unset;
         padding: 0 10px;
     }
 
-    .select2-container {
-        color: #36536D;
-    }
-
-    .select2-container .select2-selection--single {
-        height: 38px;
-    }
-
-    .select2-container--default .select2-selection--single .select2-selection__arrow {
-        top: 6px;
-    }
  
 </style>
 @Html.Partial("Layout/V2/_Bg", false)
@@ -116,13 +142,28 @@
                         foreach (var group in groups)
                         {
                             active = i == 0 ? "active" : "";
-                            <li data-target="#Carousel" data-slide-to="@(i)" class="@(active)" data-id="@(group.Id)">@(group.Name)</li>
+                            <li data-target="#Carousel" data-slide-to="@(i)" class="@(active)" data-id="@(group.Id)">
+                                @(group.Name)
+                                <img src="/Content/Image/ExerciseV2/toggle.svg" alt=""  onclick="$('.groups .group').removeClass('active'); $('.groups').css('display','flex').find('#ci_group_@(group.Id)').addClass('active')"/>
+                            </li>
                             i++;
                         }
                     }
+                    <div class="groups">
+                        @{
+                            i = 0;
+                            foreach (var group in groups)
+                            {
+                                active = i == 0 ? "active" : "";
+                                <div id="ci_group_@(group.Id)" data-target="#Carousel" data-slide-to="@(i)" class="group @(active)" data-id="@(group.Id)" onclick="$('.groups').css('display', 'none')">
+                                    @(group.Name)
+                                </div>
+                                i++;
+                            }
+                        }
+                    </div>
                 </ol>
-              
-
+           
             </div>
             <div class="carousel-inner">
                 @{
@@ -153,6 +194,7 @@
         $(function () {
             resizeHeight_Screen();
             window.addEventListener('resize', resizeHeight_Screen);
+
             @if (groups != null && groups.Any())
             {
                 <text>
@@ -160,7 +202,7 @@
                         function(e) {
                             //console.log(e)
                             var no = $(e.relatedTarget).data('id');
-                            //console.log(no);
+                            console.log(no, $("#ci_group_" + no));
                             //window.Scroll2Bottom($('#scene_' + no + ' .box-body'));
                             $(".media-box .body-content").each(function() {
                                 $(this).html('<span>播放区</span>');
@@ -169,6 +211,7 @@
                                 .removeClass('flash-scene');
                             $('#scene_' + no + ' .box-body .body-content').find('.current-scene')
                                 .removeClass('current-scene');
+                            
                         });
                 </text>
             }
@@ -315,4 +358,4 @@
             }
         };
     </script>
-}
+    }

App/Relese/Views/ExerciseV2/Student.cshtml

@@ -22,10 +22,10 @@
                 <div class="role-box">
                     <div class="body-card select-box">
                         <select class="form-control " id="role-select" name="role" style="width: 100%" autocomplete="off" placeholder="请选择角色" onchange="$(this).val()=='self'?$('.input-box').show():$('.input-box').hide()"></select>
-                    </div> 
+                    </div>
                     <div class="body-card input-box ">
-                        <input class="form-control " id="role-input" name="self-role" style="width: 100%" autocomplete="off" placeholder="请输入自定义角色"/>
-                    </div>  
+                        <input class="form-control " id="role-input" name="self-role" style="width: 100%" autocomplete="off" placeholder="请输入自定义角色" />
+                    </div>
                 </div>
                 <div class="body-card cmd-box">
                     <textarea class="form-control txt" rows="6" name="message" placeholder="请输入指令内容"></textarea>
@@ -37,6 +37,7 @@
             </div>
         </div>
     </div>
+    <div style="position: absolute; left: 0; bottom: 0; color: #ddd; opacity: 0.5;">@(groupName)</div>
 </div>
 
 @section scripts
@@ -47,10 +48,13 @@
             window.addEventListener('resize', resizeHeight_Stu);
             $.iwbAjax4({
                 url: abp.appUrl + 'Query/GetGroupRoleSelectStr?no=@(id)',
-                success: function(res) {
+                success: function (res) {
+                    var str = "<option value='self'>自定义角色</option>"
                     if (res) {
-                        res+="<option value='self'>自定义角色</option>"
+                        res += str
                         $('#role-select').html(res).select2();
+                    } else {
+                        $('#role-select').html(str).select2();
                     }
                 }
             });
@@ -59,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();
                     } else {
                         $('.help-box').hide();
                     }
@@ -76,8 +80,13 @@
             $('select[name="help"]').on('change',
                 function () {
                     if ($(this).val()) {
-                        var $txt = $(this).closest('.form-box').find('.txt');
-                        $txt.val($txt.val() + " " + $(this).find('option:selected').text());
+                        var $txt = $(this).closest('.cmd-box').find('.txt');
+                        var text = $txt.val() + " " + $(this).find('option:selected').text()
+                        if (text.length<500) {
+                            $txt.val(text);
+                        } else {
+                            abp.message.warn('指令输入不超过500字符。');
+                        }
                         $(this).val('');
                     }
                 });
@@ -115,6 +124,12 @@
                 abp.message.warn('请输入指令后再提交！');
                 return;
             }
+
+            if ( word.length >= 500) {
+                abp.message.warn('指令输入不超过500字符。');
+                return;
+            }
+
             $.iwbAjax4({
                 url: abp.appUrl + 'Eval/SaveOperationScene',
                 data: { groupNo: '@(id)', behaviorRole: role, behaviorWord: word},

App/Relese/Views/ExerciseV2/_Screen.cshtml

@@ -25,7 +25,7 @@
 <div class="box" style="width: 35%; height: 100%;" id="scene_@(groupNo)" data-isRefresh="true">
     <div class="box">
         <div class="box-header">
-            <span class="title">情景区</span>
+            <span class="title">场景区</span>
         </div>
         <div class="scene-box-body">
             <div class="box-body" style="height: calc(100% - 320px)">
@@ -229,7 +229,7 @@
                     if ($(`#scene_${groupNo} .box-body .scene-box[data-path="${data.path}"]`).length > 0) {
                         return "";
                     }
-                    var c = "handled", str3 = '', descShow = '', attachStr = '';
+                    var c = "handled", str3 = '', descShow = '', attachStr = '', guideIcon = '', guideStr = '';
                     if (isNew) {
                         c = "flash-scene new-scene new-scene2";
                         //str2 = '<span class="label label-danger no-scene">未处理</span>';
@@ -255,9 +255,21 @@
                             }
                         }
                     }
+                    if (data.guideInfos && data.guideInfos.length) {
+                        guideIcon =
+                            '<span class="btn btn-tool" title="点击查看提示引导信息" onclick="ToggleGuide(this)"><i class="fas fa-question"></i></span>';
+                        guideStr += '<div class="guide-box" style="display:block"><p class="guide-title">提示：</p>';
+                        var i = 0;
+                        data.guideInfos.forEach((v) => {
+                            i++;
+                            guideStr += '<p class="guide-info">{0}、{1}</p>'.format(i, v.description);
+                        });
+                        guideStr += '</div>';
+                    }
+
                     str +=
-                        '<div class="scene-box {3}" data-id="{0}"  data-path="{5}"><div class="title"><span class="text">{1}</span><div class="attach-box">{4}</div>{6}</div><div class="desc"  style="display:{7};">{2}</div></div>'
-                            .format(data.id, data.name, data.description, c, attachStr, data.path, str3, descShow);
+                        '<div class="scene-box {3}" data-id="{0}"  data-path="{5}"><div class="title"><span class="text">{1}</span><div class="attach-box">{4}</div>{6}</div><div class="desc"  style="display:{7};">{2}{8}</div></div>'
+                        .format(data.id, data.name, data.description, c, attachStr, data.path, str3, descShow, guideStr);
                 }
                 return str;
             }

App/Relese/Views/Home/Index.cshtml

@@ -9,22 +9,54 @@
 }
 @section css{
 <style>
-    .content,.container-fluid {
-        padding: 0!important;
+    .content, .container-fluid, .content-wrapper {
+        padding: 0 !important;
     }
-    .home, .page::before {
+    .body {
+        width: 100%;
+        height: calc(100vh - 48px );
         background: url('@(path)/@(IwbConsts.HomeImageName).@(IwbConsts.LoginHomeImageExt)') 0 / cover fixed;
+        font-weight: 600;
+        display: flex;
+        flex-direction: column;
+        justify-content: center;
+        align-items: center;
+        color: #000;
+        position: relative;
+    }
+    .first {
+        margin: -10% 0 10px;
+        font-size: 50px;
+        display: flex;
+        justify-content: center;
+        align-items: center;
+    }
+    .first img {
+        width: 80px;
+        height: 80px;
+        margin-right: 10px;
+    }
+    .second {
+        font-size: 65px;
+    }
+    .footer {
+        width: 100%;
+        text-align: center;
+        position: absolute;
+        bottom: 30px;
+        left: 0;
+        color:#9BA5BA;
+    }
+    .main-footer {
+        display: none;
     }
 </style>
-    <link href="~/Content/Css/Home.css" rel="stylesheet" />
 }
-<div class="home">
-    <div class="page no-select">
-        <div class="page-title">
-            <span>欢迎登陆</span> 
-        </div>
-        <div class="page-title-sm">
-            <span>@systemName</span> 
-        </div>
+<div class="body no-select">
+    <div class="first">
+        <img src="/Content/Image/logo.png" />
+        <span>欢迎登录</span>
     </div>
+    <div class="second">@systemName</div>
+    <div class="footer">@Html.Raw(SettingManager.GetSettingValue(IwbSettingNames.HtmlPagesFooter))</div>
 </div>

App/Relese/Views/Shared/Layout/_MainSidebar.cshtml

@@ -14,7 +14,7 @@
     }
 </style>
 <!-- Main Sidebar Container -->
-<aside class="main-sidebar sidebar-dark-primary elevation-4">
+<aside class="main-sidebar  sidebar-light  elevation-4">
     <!-- Brand Logo -->
     <style>
         .text-md .brand-link {
@@ -35,6 +35,53 @@
             font-weight: 600 ;
             color: #eee;
         }
+
+        [class*=sidebar-light] {
+            background: #F8FAFB;
+            color: #000;
+        }
+        [class*=sidebar-light] .text-md .brand-link {
+                color: #000;
+            }
+        [class*=sidebar-light] .text-md .brand-link:hover {
+                    color: #000;
+                }
+        [class*=sidebar-light] .text-md .brand-link .brand-image {
+                    background: #F8FAFB;
+                }
+        [class*=sidebar-light] .text-md .brand-link .brand-text {
+                    color: #000;
+                }
+        [class*=sidebar-light] .nav-pills .nav-link {
+                color: #222222;
+                background: #F8FAFB;
+            }
+
+        .sidebar-mini.sidebar-collapse .main-sidebar:hover .nav-sidebar.nav-child-indent .nav-treeview {
+            padding-left: 0;
+        }
+            [class*=sidebar-light] .nav-legacy.nav-sidebar   .nav-treeview, [class*=sidebar-light] .nav-legacy.nav-sidebar  .nav-treeview {
+                padding-left: 0;
+                background: transparent;
+            }
+        /* [class*=sidebar-light] .nav-legacy.nav-sidebar > .nav-item > .nav-treeview { */
+        /*     background: #E9F0FE; */
+        /* } */
+        [class*=sidebar-light] .nav-treeview > .nav-item > .nav-link {
+            padding-left: 25px;
+        }
+        [class*=sidebar-light]  .nav-treeview  .nav-treeview > .nav-item > .nav-link {
+            padding-left: 40px;
+        }
+        [class*=sidebar-light] .nav-treeview .nav-treeview .nav-treeview > .nav-item > .nav-link {
+            padding-left: 60px;
+        }
+        [class*=sidebar-light] .nav-legacy .nav-treeview > .nav-item > .nav-link.active,
+        [class*=sidebar-light] .nav-legacy .nav-treeview > .nav-item > .nav-link:focus,
+        [class*=sidebar-light] .nav-legacy .nav-treeview > .nav-item > .nav-link:hover {
+            background: #E9F0FE;
+            color: #1C5DE1;
+        }
     </style>
     <div class=" text-md">
         <a href="@(ApplicationPath)" class="brand-link">
@@ -48,7 +95,7 @@
 
 <!-- Sidebar -->
     <div class="sidebar">
-        @Html.Action("UserMenu", "Layout",new{id="Sidebar"})
+        @*@Html.Action("UserMenu", "Layout",new{id="Sidebar"})*@
         <nav class="mt-2">
             <ul class="nav nav-pills nav-sidebar flex-column nav-child-indent nav-compact nav-legacy" data-widget="treeview" role="menu" data-accordion="false">
                 @Html.Action("NavSideBar", "Layout", new {activeMenu = ViewBag.ActiveMenu})

App/Relese/Views/Train/_Select.cshtml

@@ -5,7 +5,11 @@
 }
 <style>
     .content-wrapper {
-        padding: 0!important;
+        padding: 0 !important;
+        background-image: url(/Content/Image/ExerciseV2/bg.jpg);
+        background-repeat: no-repeat;
+        background-size: 100% 100%;
+        overflow: hidden;
     }
     .body {
         width: 100% !important;

OnlineApp/Relese/Resources/Guids.iwbx

@@ -1,8 +0,0 @@
-<Guids>
-  <Guid type="UserNo" step="1" last-id="10000" last-date="1900/1/1 0:00:00">
-  </Guid>
-  <Guid type="Guest" step="1" last-id="10002" last-date="2020/7/22 11:12:00">
-  </Guid>
-  <Guid type="DataLib" step="1" last-id="1022" last-date="2024/3/11 12:57:01">
-  </Guid>
-</Guids>

Platform/Relese/bin/Resources/Guids.iwbx

@@ -1,8 +0,0 @@
-<Guids>
-  <Guid type="UserNo" step="1" last-id="10003" last-date="2020/8/25 15:05:24">
-  </Guid>
-  <Guid type="Guest" step="1" last-id="10001" last-date="1900/1/1 0:00:00">
-  </Guid>
-  <Guid type="DataLib" step="1" last-id="20101" last-date="2024/6/14 11:33:29">
-  </Guid>
-</Guids>