فهرست منبع

修复质量分析、人工确定、轨迹阅卷图片显示不全问题

ting.yin 4 سال پیش
والد
کامیت
b84f67de0c

+ 42 - 22
stmms-web/src/main/webapp/WEB-INF/views/modules/exam/checkStudentEdit.jsp

@@ -15,6 +15,7 @@
     
     <link rel="stylesheet" href="${ctxStatic}/iviewer/jquery.iviewer.css"/>
     <script type="text/javascript" src="${ctxStatic}/iviewer/jquery.iviewer.js"></script>
+    <script type="text/javascript" src="${ctxStatic}/utils/image-utils.js"></script>
 </head>
 <body id="index">
 <div class="wp">
@@ -31,12 +32,12 @@
                 <span class="b">主观总分:</span><span class="i r" id="subjectiveScore"></span>
             </div>
         </div>
-        <div class="y cl">
+ <!--        <div class="y cl">
             <div class="iviewer_zoom_in" id="zoom-in-button"></div>
             <div class="iviewer_zoom_out" id="zoom-out-button"></div>
             <div class="iviewer_zoom_zero" id="zoom-origin-button"></div>
-            <div class="iviewer_zoom_fit" id="zoom-fit-button"></div>
-        </div>
+            <div class="iviewer_zoom_fit" id="zoom-fit-button"></div> 
+        </div> -->
     </div>
     <div class="middle">
         <div class="middle-bg"></div>
@@ -196,27 +197,46 @@
             }
         }
 
-        if (iviewer == undefined) {
-            iviewer = $('#image-holder').iviewer({
-                src: '${fileServer}' + student.sheetUrls[0],
-                zoom_delta: 1.2,
-                zoom: 'fit',
-                zoom_min: 10,
-                mousewheel: false,
-                zoom_animation: false,
-                update_on_resize: true,
-                ui_disabled: true,
-                onFinishLoad: function (ev, url) {
-                    $('#image-holder').show();
-                    onProcessFinish(false);
-                },
-                onErrorLoad: function (ev, url) {
-                    onProcessFinish(true);
-                }
-            });
+        var urls = [];
+       	for(var j = 0; j < student.sheetUrls.length; j++){
+       		if(j%2==0){
+       			urls.push(student.sheetUrls[j]);
+       		}
+       	}
+        var pane = $('<canvas id="track-builder-canvas"></canvas>').appendTo($('#image-holder'));
+        var canvas = document.getElementById('track-builder-canvas');
+        var ctx = canvas.getContext('2d');
+        var image = new Image();
+        new ImageLoader({
+            server: '${fileServer}',
+            flush: true,
+            strict: false,
+            split: [0,1]
+        }).combine(urls, canvas, [], function () {
+        })
+        $('#image-holder').show();
+     
+         /* if (iviewer == undefined) {
+	            iviewer = $('#image-holder').iviewer({
+	                src: image,
+	                zoom_delta: 1.2,
+	                zoom: 'fit',
+	                zoom_min: 10,
+	                mousewheel: false,
+	                zoom_animation: false,
+	                update_on_resize: true,
+	                ui_disabled: true,
+	                onFinishLoad: function (ev, url) {
+	                    $('#image-holder').show();
+	                    onProcessFinish(false);
+	                },
+	                onErrorLoad: function (ev, url) {
+	                    onProcessFinish(true);
+	                }
+	            });
         } else {
             iviewer.iviewer('loadImage', '${fileServer}' + student.sheetUrls[0]);
-        }
+        }  */
     }
 
     function save() {

+ 2 - 2
stmms-web/src/main/webapp/WEB-INF/views/modules/exam/qualityProcess.jsp

@@ -55,9 +55,9 @@
                 'quality-process': {
                 	forbiddenInfo:${(web_user.subjectHeader==true||web_user.schoolViewer==true) && forbiddenInfo==true}
                 },
-                'sheet-view': {
+                /* 'sheet-view': {
                     server: '${fileServer}'
-                },
+                }, */
                 'warning-info': {},
                 'thumbnail': {},
                 'view-sidebar': {

+ 1 - 1
stmms-web/src/main/webapp/static/answer-check/css/style.css

@@ -194,7 +194,7 @@ input[type="text"]:focus {
 .right .image-content {
 	width: 100%;
 	height: 100%;
-	overflow: hidden;
+	overflow: auto;
 }
 .right + * {
 	overflow: hidden;

+ 1 - 1
stmms-web/src/main/webapp/static/mark-track/js/modules/single-image-view.js

@@ -46,7 +46,7 @@ function SingleImageView(option) {
 SingleImageView.prototype.init = function () {
     var self = this;
     this.container = getDom(this.container_dom, this.markControl).appendTo(this.markControl.container.centerContent);
-    this.container.height(this.markControl.container.centerContent.height());
+    this.container.height(this.markControl.container.centerContent.height()-20);
     //this.container.perfectScrollbar({
     //    wheelSpeed: 20
     //});