Merge branch 'master' of http://39.98.153.250:9080/bowintek/GHSCPartyBuild

src/main/resources/static/app/main/exammanage/practice/setting.js

@@ -57,6 +57,7 @@
                 return;
             }
             $scope.getPracticeQuestions().then(function () {
+                $scope.isFinish=false;
                 $scope.activeTab = 2;
                 $scope.generatePaper();
             });

src/main/resources/static/content/themes/css/style.css

@@ -6908,116 +6908,116 @@ section.content {
 
 .form-group .form-control {
     width: 100%;
-/*border: none;*/
-box-shadow: none;
--webkit-border-radius: 0;
--moz-border-radius: 0;
--ms-border-radius: 0;
-border-radius: 0;
-padding-left: 0;
+    /*border: none;*/
+    box-shadow: none;
+    -webkit-border-radius: 0;
+    -moz-border-radius: 0;
+    -ms-border-radius: 0;
+    border-radius: 0;
+    padding-left: 0;
 }
 
 .form-group .help-info {
-float: right;
-font-size: 12px;
-margin-top: 5px;
-color: #999;
+    float: right;
+    font-size: 12px;
+    margin-top: 5px;
+    color: #999;
 }
 
 .form-group label.error {
-font-size: 12px;
-display: block;
-margin-top: 5px;
-font-weight: normal;
-color: #F44336;
+    font-size: 12px;
+    display: block;
+    margin-top: 5px;
+    font-weight: normal;
+    color: #F44336;
 }
 
 .form-group .form-line {
-width: 100%;
-position: relative;
-/*border-bottom: 1px solid #ddd;*/
+    width: 100%;
+    position: relative;
+    /*border-bottom: 1px solid #ddd;*/
 }
 
 .form-group .form-line:after {
-content: '';
-position: absolute;
-left: 0;
-width: 100%;
-height: 0;
-bottom: -1px;
--moz-transform: scaleX(0);
--ms-transform: scaleX(0);
--o-transform: scaleX(0);
--webkit-transform: scaleX(0);
-transform: scaleX(0);
--moz-transition: 0.25s ease-in;
--o-transition: 0.25s ease-in;
--webkit-transition: 0.25s ease-in;
-transition: 0.25s ease-in;
-border-bottom: 2px solid #1f91f3;
+    content: '';
+    position: absolute;
+    left: 0;
+    width: 100%;
+    height: 0;
+    bottom: -1px;
+    -moz-transform: scaleX(0);
+    -ms-transform: scaleX(0);
+    -o-transform: scaleX(0);
+    -webkit-transform: scaleX(0);
+    transform: scaleX(0);
+    -moz-transition: 0.25s ease-in;
+    -o-transition: 0.25s ease-in;
+    -webkit-transition: 0.25s ease-in;
+    transition: 0.25s ease-in;
+    border-bottom: 2px solid #1f91f3;
 }
 
 .form-group .form-line .form-label {
-font-weight: normal;
-color: #aaa;
-position: absolute;
-top: 10px;
-left: 0;
-cursor: text;
--moz-transition: 0.2s;
--o-transition: 0.2s;
--webkit-transition: 0.2s;
-transition: 0.2s;
+    font-weight: normal;
+    color: #aaa;
+    position: absolute;
+    top: 10px;
+    left: 0;
+    cursor: text;
+    -moz-transition: 0.2s;
+    -o-transition: 0.2s;
+    -webkit-transition: 0.2s;
+    transition: 0.2s;
 }
 
 .form-group .form-line.error:after {
-border-bottom: 2px solid #F44336;
+    border-bottom: 2px solid #F44336;
 }
 
 .form-group .form-line.success:after {
-border-bottom: 2px solid #4CAF50;
+    border-bottom: 2px solid #4CAF50;
 }
 
 .form-group .form-line.warning:after {
-border-bottom: 2px solid #FFC107;
+    border-bottom: 2px solid #FFC107;
 }
 
 .form-group .form-line.focused:after {
--moz-transform: scaleX(1);
--ms-transform: scaleX(1);
--o-transform: scaleX(1);
--webkit-transform: scaleX(1);
-transform: scaleX(1);
+    -moz-transform: scaleX(1);
+    -ms-transform: scaleX(1);
+    -o-transform: scaleX(1);
+    -webkit-transform: scaleX(1);
+    transform: scaleX(1);
 }
 
 .form-group .form-line.focused .form-label {
-top: -10px;
-left: 0;
-font-size: 12px;
+    top: -10px;
+    left: 0;
+    font-size: 12px;
 }
 
 .form-group-sm .form-label {
-font-size: 12px;
+    font-size: 12px;
 }
 
 .form-group-sm .form-line.focused .form-label {
-bottom: 20px;
-font-size: 10px;
+    bottom: 20px;
+    font-size: 10px;
 }
 
 .form-group-lg .form-label {
-font-size: 18px;
+    font-size: 18px;
 }
 
 .form-group-lg .form-line.focused .form-label {
-bottom: 35px;
-font-size: 12px;
+    bottom: 35px;
+    font-size: 12px;
 }
 
 .form-control[disabled],
 .form-control[readonly],
 fieldset[disabled] .form-control {
-background-color: transparent;
+    background-color: transparent;
 }
 
 /* Color Picker ================================ */
@@ -10116,6 +10116,7 @@ background-color: transparent;
     z-index: 99999999;
 }
 
+/**考试模块单选框复选框选中时导致页面头部隐藏需要修改height的数值*/
 .sidebar {
     -moz-transition: all 0.5s;
     -o-transition: all 0.5s;
@@ -10126,7 +10127,7 @@ background-color: transparent;
     width: 260px;
     overflow: hidden;
     display: inline-block;
-    height: calc(100vh - 70px);
+    height: calc(100vh - 150px);
     position: fixed;
     top: 69px;
     left: 0;