bug修改

src/assets/styles/main.less

@@ -700,7 +700,7 @@
   .exam-paper-subjects {
     float: right;
     button {
-      width: 80px;
+      min-width: 80px;
     }
   }
 }

src/components/SimpleImagePreview.vue

@@ -13,7 +13,7 @@
       <Icon type="ios-close" />
     </div>
 
-    <div :class="[`${prefixCls}-body`]" ref="ReviewBody" @click="cancel">
+    <div :class="[`${prefixCls}-body`]" ref="ReviewBody">
       <div
         :class="[`${prefixCls}-guide`, `${prefixCls}-guide-prev`]"
         @click.stop="showPrev"
@@ -32,7 +32,7 @@
           { [`${prefixCls}-imgs-nosition`]: nosition }
         ]"
         :style="styles"
-        v-move-ele.prevent.stop="{ mouseMove }"
+        v-move-ele.prevent.stop="{ mouseMove, click: cancel }"
         v-if="modalIsShow"
       >
         <img

src/components/common/ImagePreview/move-ele.js

@@ -5,8 +5,10 @@ export default {
     let [oleft, otop] = [0, 0];
     // 元素移动后的left,top
     let [left, top] = [0, 0];
+    let isDrag = false;
 
     let moveHandle = function(e) {
+      isDrag = true;
       if (modifiers.prevent) {
         e.preventDefault();
       }
@@ -29,9 +31,12 @@ export default {
       otop = top;
 
       if (value && value.mouseUp) value.mouseUp({ oleft, otop });
+      if (value && value.click && !isDrag) value.click();
 
       document.removeEventListener("mousemove", moveHandle);
       document.removeEventListener("mouseup", upHandle);
+
+      isDrag = false;
     };
 
     el.addEventListener("mousedown", function(e) {

src/components/common/ImportFile/ImportFile.vue

@@ -22,11 +22,13 @@
           :on-error="handleError"
           :on-success="handleSuccess"
           :on-remove="handleRemove"
+          :disabled="!!load"
           ref="UploadComp"
         >
           <div style="padding: 40px 0">
             <Icon class="upload-icon" type="md-cloud-upload" size="40"></Icon>
-            <p>将文件拖到此处，或<em>点击上传</em></p>
+            <p v-if="load">正在导入……</p>
+            <p v-else>将文件拖到此处，或<em>点击上传</em></p>
           </div>
         </Upload>
         <p
@@ -103,7 +105,8 @@ export default {
       res: {
         success: true,
         msg: ""
-      }
+      },
+      load: null
     };
   },
   computed: {
@@ -133,15 +136,25 @@ export default {
         success: true,
         msg: ""
       };
+
+      this.load = this.$Message.loading({
+        content: "Loading...",
+        duration: 0
+      });
     },
     handleError(error, response) {
+      this.load();
+      this.load = null;
       this.res = {
         success: false,
         msg: response.message
       };
     },
     handleSuccess(response) {
+      this.load();
+      this.load = null;
       this.$emit("upload-success", response);
+      this.cancel();
     },
     handleFormatError() {
       this.res = {

src/modules/grading/components/GradeHistoryPaper.vue

@@ -49,7 +49,8 @@ export default {
   },
   computed: {
     title() {
-      if (this.IS_MARK_LEADER) return `一键定档  ${this.curPaper.level}`;
+      if (this.IS_MARK_LEADER)
+        return this.curPaper.level ? `一键定档  ${this.curPaper.level}` : "";
       return this.curPaper.result ? `已评  ${this.curPaper.result}` : "";
       // return this.curPaper.sn ? `NO.${this.curPaper.sn}` : "";
     }

src/modules/main/PaperManage.vue

@@ -27,23 +27,20 @@
           </Select>
         </FormItem>
         <FormItem>
-          <InputNumber
+          <Input
             v-model="filter.startNumber"
-            :min="1"
-            :precision="0"
+            type="text"
             placeholder="输入开始编号"
             clearable
-          ></InputNumber>
+          />
         </FormItem>
         <FormItem>
-          <InputNumber
+          <Input
             v-model="filter.endNumber"
-            :min="filter.startNumber"
-            :precision="0"
-            :active-change="false"
+            type="text"
             placeholder="输入结束编号"
             clearable
-          ></InputNumber>
+          />
         </FormItem>
         <FormItem>
           <Select

src/modules/main/QualityAnalysis.vue

@@ -63,7 +63,7 @@
     </div>
 
     <Row :gutter="20">
-      <Col span="12">
+      <Col :span="24" :xl="12">
         <div class="part-box" v-if="levelsPropReportData">
           <echart-render
             chart-title="档位分布图"
@@ -72,7 +72,7 @@
           ></echart-render>
         </div>
       </Col>
-      <Col span="12">
+      <Col :span="24" :xl="12">
         <div class="part-box" v-if="deviationReportData">
           <echart-render
             chart-title="累计偏差"
@@ -85,7 +85,7 @@
     </Row>
 
     <Row :gutter="20">
-      <Col span="12">
+      <Col :span="24" :xl="12">
         <div class="part-box" v-if="distanceReportData">
           <echart-render
             chart-title="累计误差"
@@ -95,7 +95,7 @@
           ></echart-render>
         </div>
       </Col>
-      <Col span="12">
+      <Col :span="24" :xl="12">
         <div class="part-box" v-if="callbackReportData">
           <echart-render
             chart-title="打回次数"

src/modules/main/StudentManage.vue

@@ -8,12 +8,12 @@
           @click="$refs.ExportStudent.open()"
           >导入考生信息</Button
         >
-        <Button
+        <!-- <Button
           icon="upload icon"
           shape="circle"
           @click="$refs.ExportRelate.open()"
           >导入关联信息</Button
-        >
+        > -->
       </div>
       <div class="part-box-head-right">
         <Button
@@ -75,23 +75,20 @@
           </Select>
         </FormItem>
         <FormItem>
-          <InputNumber
+          <Input
             v-model="filter.startNumber"
-            :min="1"
-            :precision="0"
-            placeholder="输入起始考号"
+            type="text"
+            placeholder="输入开始编号"
             clearable
-          ></InputNumber>
+          />
         </FormItem>
         <FormItem>
-          <InputNumber
-            :min="filter.startNumber"
+          <Input
             v-model="filter.endNumber"
-            :precision="0"
-            :active-change="false"
-            placeholder="输入终止考号"
+            type="text"
+            placeholder="输入结束编号"
             clearable
-          ></InputNumber>
+          />
         </FormItem>
         <FormItem>
           <Input
@@ -257,11 +254,11 @@ export default {
           key: "examNumber",
           minWidth: 120
         },
-        {
-          title: "关联考号",
-          key: "relateExamNumber",
-          minWidth: 120
-        },
+        // {
+        //   title: "关联考号",
+        //   key: "relateExamNumber",
+        //   minWidth: 120
+        // },
         {
           title: "考区",
           key: "areaName",
@@ -476,6 +473,11 @@ export default {
     uploadSuccess() {
       this.getList();
       this.getAreaList();
+      this.$Notice.success({
+        title: "导入提示",
+        desc: "考生信息导入成功！",
+        duration: 0
+      });
     },
     toAdd() {
       this.curStudent = { workId: this.filter.workId };

src/modules/main/components/QualityAnalysisExport.vue

@@ -164,9 +164,11 @@ export default {
       }
 
       let result = true;
+      const user = this.$ls.get("user", { token: "", id: "" });
       await download({
         type: "post",
         url: `${this.GLOBAL.domain}/api/exportPdf`,
+        header: { Authorization: user.token, userId: user.id },
         data: {
           content: contents
         },

src/modules/mark/MarkDetail.vue

@@ -313,15 +313,13 @@ export default {
             type: "done"
           };
         });
-      if (this.IS_MARK_LEADER) {
-        const msInfo = data.find(item => item.id === "manualScore");
-        if (msInfo) {
-          levelStep.push({
-            count: msInfo.count,
-            name: "输分试卷",
-            type: "manualScore"
-          });
-        }
+      const msInfo = data.find(item => item.id === "manualScore");
+      if (msInfo) {
+        levelStep.push({
+          count: msInfo.count,
+          name: "输分试卷",
+          type: "manualScore"
+        });
       }
 
       this.steps = { levelStep, otherStep };

src/modules/mark/components/MarkAction.vue

@@ -467,7 +467,7 @@ export default {
         this.curPaperLevel =
           this.curPaperOrTask["displayNumber"] && this.stepType !== "shiftScore"
             ? this.curPaperOrTask["serialNumber"]
-            : this.curLevel.name;
+            : this.curPaperOrTask.level;
         this.updateScoreList();
       }
       if (this.rights.markHis) {

src/modules/quality/Quality.vue

@@ -47,23 +47,20 @@
                 </Select>
               </FormItem>
               <FormItem>
-                <InputNumber
+                <Input
                   v-model="filter.startNumber"
-                  :precision="0"
-                  :min="1"
-                  placeholder="输入起始编号"
+                  type="text"
+                  placeholder="输入开始编号"
                   clearable
-                ></InputNumber>
+                />
               </FormItem>
               <FormItem>
-                <InputNumber
+                <Input
                   v-model="filter.endNumber"
-                  :min="filter.startNumber"
-                  :precision="0"
-                  :active-change="false"
-                  placeholder="输入终止编号"
+                  type="text"
+                  placeholder="输入结束编号"
                   clearable
-                ></InputNumber>
+                />
               </FormItem>
               <FormItem>
                 <Select