Merge branch 'dev_v4.0.1' of http://git.qmth.com.cn/examcloud-frontend/examcloud-admin-web into dev_v4.0.1

src/modules/marking/views/Marking.vue

@@ -199,7 +199,7 @@
         <span class="pull-right icon-right">
           <small class="marktitle titlefont">
             <span class="titlefont">
-              <v-icon name="user" style="height:12" />
+              <v-icon name="user" style="height:12px" />
               {{ user.displayName }}
             </span>
           </small>

src/modules/marking/views/TpMain.vue

@@ -138,17 +138,20 @@ export default {
       viewer.show();
     },
     getPdfUrl() {
-      var url = this.studentPaper.studentSubjectiveHtml;
-      var content = "";
-      if (url) {
-        if (url != "" && url.indexOf(".pdf") > -1) {
+      let url = this.studentPaper.studentSubjectiveHtml;
+      let content = "";
+
+      if (url && url.length > 1) {
+        if (url.indexOf(".pdf") > -1) {
           content =
             "<embed src='" + url + "'  width='800px' height='800px'></embed>";
-        }
-        if (url != "" && url.indexOf(".zip") > -1) {
+        } else if (url.indexOf(".zip") > -1) {
           content = "<a href='" + url + "'>下载</a>";
+        } else if (/(.*)\.(jpg|gif|jpeg|png)$/.test(url)) {
+          //content = url;
         }
       }
+
       return content;
     },
     createMarkDraw() {