Merge branch 'master' of http://git.qmth.com.cn/ExamCloud-3/examcloud-web-admin

src/modules/examwork/view/examStudent.vue

@@ -1145,7 +1145,8 @@ export default {
       this.photoDialog = false;
     },
     showPhoto(row) {
-      var url =
+      this.photo.url = "";
+      let url =
         CORE_API +
         "/student/getStudentInfo?rootOrgId=" +
         row.rootOrgId +

src/modules/examwork/view/student.vue

@@ -441,6 +441,7 @@
         <!--查看照片-->
         <el-dialog
           title="照片"
+          @close="closePhotoDialog"
           :visible.sync="photoDialog"
           width="300px"
           :center="true"
@@ -622,7 +623,12 @@ export default {
       this.stuExamPageSize = val;
       this.searchStuExam();
     },
+    closePhotoDialog() {
+      this.photo.url = "";
+      this.photoDialog = false;
+    },
     showPhoto(row) {
+      this.photo.url = "";
       if (row.photoPath) {
         this.photo.url = row.photoPath;
         this.photoDialog = true;

src/modules/marking/views/MarkPaperCheck.vue

@@ -21,6 +21,7 @@
                 placeholder="请选择"
                 filterable
                 style="width:150px;"
+                @focus="e => getSpecialtyList4Search(e.target.value)"
               >
                 <el-option label="请选择" value></el-option>
                 <el-option