Merge branch 'master' of http://git.qmth.com.cn/themis/frontend-admin

src/features/examwork/CourseManagement/CoursePaperDialog.vue

@@ -40,14 +40,19 @@
           </el-table-column>
           <el-table-column width="170" label="抽卷几率">
             <span slot-scope="scope">
-              <el-input-number v-model.trim="scope.row.weight">
+              <el-input-number
+                v-model.trim="scope.row.weight"
+                :min="0"
+                :max="100"
+              >
                 <template slot="append">%</template></el-input-number
               >
             </span>
           </el-table-column>
-          <el-table-column width="170" :min="1" label="音频播放次数">
+          <el-table-column width="170" label="音频播放次数">
             <span slot-scope="scope">
               <el-input-number
+                :min="1"
                 v-model.trim="scope.row.audioPlayCount"
               ></el-input-number>
             </span>

src/features/examwork/CourseManagement/PaperImportDialog.vue

@@ -2,7 +2,7 @@
   <el-dialog
     ref="dialog"
     title="导入试卷"
-    width="550px"
+    width="560px"
     :visible.sync="visible"
     @close="closeDialog"
   >

src/features/examwork/ExamManagement/ExamEdit.vue

@@ -422,8 +422,55 @@
                       padding: 10px;
                       font-size: 10px;
                       background: #f0f4f9;
+                      position: relative;
                     "
                   >
+                    <div
+                      style="
+                        position: absolute;
+                        width: 108px;
+                        height: 40px;
+                        border-left: 1px dotted grey;
+                        border-bottom: 1px dotted grey;
+                        left: 35px;
+                        top: 115px;
+                        border-radius: 5px;
+                      "
+                      :class="
+                        form.monitorVideoSource.includes('MOBILE_SECOND') &&
+                        'enhance-left-bottom-line'
+                      "
+                    ></div>
+                    <div
+                      style="
+                        position: absolute;
+                        width: 108px;
+                        height: 40px;
+                        border-right: 1px dotted grey;
+                        border-top: 1px dotted grey;
+                        right: 35px;
+                        bottom: 122px;
+                        border-radius: 5px;
+                      "
+                      :class="
+                        form.monitorVideoSource.includes('MOBILE_FIRST') &&
+                        'enhance-right-bottom-line'
+                      "
+                    ></div>
+                    <div
+                      style="
+                        position: absolute;
+                        width: 2px;
+                        height: 10px;
+                        border-right: 1px dotted grey;
+                        left: 236px;
+                        top: 92px;
+                      "
+                      :class="
+                        form.monitorVideoSource.includes('CLIENT_CAMERA') &&
+                        'enhance-right-line'
+                      "
+                    ></div>
                     <div class="d-flex">
                       <div
                         class="d-flex flex-column justify-content-center align-items-center"
@@ -904,4 +951,18 @@ export default {
     background-image: url(./imgs/电脑操作录屏-选中.png);
   }
 }
+
+.enhance-left-bottom-line {
+  border-left-style: solid !important;
+  border-bottom-style: solid !important;
+}
+
+.enhance-right-bottom-line {
+  border-right-style: solid !important;
+  border-top-style: solid !important;
+}
+
+.enhance-right-line {
+  border-right-style: solid !important;
+}
 </style>

src/features/examwork/ExamStudentImport/ExamStudentImportDialog.vue

@@ -2,7 +2,7 @@
   <el-dialog
     ref="dialog"
     :title="'导入' + '考生'"
-    width="450px"
+    width="480px"
     :visible.sync="visible"
     @close="closeDialog"
   >

src/styles/global.css

@@ -108,3 +108,7 @@ body {
   color: #444444;
   background-color: #ffffff;
 }
+
+input[type=file] {
+  overflow: hidden;
+}