zhangjie 8 months ago
parent
commit
db81a111ff

+ 4 - 2
src/components/ImageViewContain.vue

@@ -1,11 +1,13 @@
 <template>
-  <div :class="['image-view-contain', { 'image-view-none': !image.thumbSrc }]">
+  <div
+    :class="['image-view-contain', { 'image-view-none': !image.thumbSrc }]"
+    @click="toReview"
+  >
     <div class="image-view-image" :style="styles">
       <img
         v-if="image.thumbSrc"
         :src="image.thumbSrc"
         :alt="image.title"
-        @click="toReview"
         @load="resizeImage"
       />
     </div>

+ 2 - 5
src/modules/grading/leader/LeaderGrading.vue

@@ -343,8 +343,6 @@ export default {
       return data;
     },
     async getMarkList(params) {
-      const userId = this.$ls.get("user", { id: "" }).id;
-      const markDisabled = userId !== params.markerId;
       const datas = {
         ...params,
         workId: this.workId,
@@ -355,9 +353,6 @@ export default {
       };
 
       const data = await markTaskPaperList(datas);
-      data.data.forEach((item) => {
-        item.markDisabled = markDisabled;
-      });
       return data;
     },
     async toPage(page) {
@@ -441,6 +436,7 @@ export default {
       if (this.papers.length) {
         this.selectPaper(0);
       } else {
+        this.paperKey = this.$randomCode();
         this.curPaper = {};
       }
     },
@@ -513,6 +509,7 @@ export default {
       this.setShortcut(["action"]);
       this.isFullscreenMarking = true;
       this.clearMultiplePaper();
+      this.paperKey = this.$randomCode();
       this.curPaperIndex = this.papers.findIndex((item) => item.id === data.id);
       this.curPaper = Object.assign({}, this.papers[this.curPaperIndex], data);
       this.$refs.SimpleImagePreview.open();

+ 1 - 0
src/modules/grading/marker/MarkerGrading.vue

@@ -626,6 +626,7 @@ export default {
       this.setShortcut(["action"]);
       this.isFullscreenMarking = true;
       this.clearMultiplePaper();
+      this.paperKey = this.$randomCode();
       this.curPaperIndex = this.papers.findIndex((item) => item.id === data.id);
       this.curPaper = Object.assign({}, this.papers[this.curPaperIndex], data);
       this.$refs.SimpleImagePreview.open();

+ 12 - 12
src/modules/main/PaperManage.vue

@@ -87,16 +87,7 @@
             ></Option>
           </Select>
         </FormItem>
-      </Form>
-      <div class="box-justify">
-        <Button
-          type="success"
-          shape="circle"
-          icon="upload-white icon"
-          @click="toExportMark"
-          >导出标记试卷</Button
-        >
-        <div>
+        <FormItem>
           <Button
             size="small"
             class="btn-form-search"
@@ -112,8 +103,17 @@
             @click="toExport"
             >导出</Button
           >
-        </div>
-      </div>
+        </FormItem>
+      </Form>
+      <!-- <div class="box-justify">
+        <Button
+          type="success"
+          shape="circle"
+          icon="upload-white icon"
+          @click="toExportMark"
+          >导出标记试卷</Button
+        >
+      </div> -->
     </div>
 
     <image-action-list

+ 1 - 0
src/modules/mark/leader/LeaderMarking.vue

@@ -366,6 +366,7 @@ export default {
     toReview(data) {
       this.setShortcut(["action"]);
       this.isFullscreenMarking = true;
+      this.paperKey = this.$randomCode();
       this.curPaperIndex = this.papers.findIndex((item) => item.id === data.id);
       this.curPaper = Object.assign({}, this.papers[this.curPaperIndex], data);
       this.$refs.SimpleImagePreview.open();

+ 1 - 0
src/modules/mark/marker/MarkerMarking.vue

@@ -440,6 +440,7 @@ export default {
     toReview(data) {
       this.setShortcut(["action"]);
       this.isFullscreenMarking = true;
+      this.paperKey = this.$randomCode();
       this.curPaperIndex = this.papers.findIndex((item) => item.id === data.id);
       this.curPaper = Object.assign({}, this.papers[this.curPaperIndex], data);
       this.$refs.SimpleImagePreview.open();