org more md

src/assets/styles/common-component.less

@@ -46,7 +46,10 @@
   }
   &-imgs {
     position: absolute;
+    top: 0;
+    left: 50%;
     width: 600px;
+    margin-left: -300px;
     // box-shadow: 0px 24px 36px 0px rgba(0, 0, 0, 0.3);
     transition: width, height, transform 0.2s linear;
     z-index: 8;
@@ -124,10 +127,10 @@
     position: absolute;
     width: 60px;
     height: 60px;
-    top: 50%;
+    top: 0;
     left: 50%;
-    margin: -30px 0 0 -30px;
-    color: @main-color;
+    margin: 0 0 0 -30px;
+    color: @border-color-base;
     font-size: 50px;
     text-align: center;
     line-height: 60px;

src/assets/styles/mark.less

@@ -666,33 +666,27 @@
       line-height: 25px;
       margin-bottom: 20px;
     }
-    .grade-history-list {
-      font-size: 0;
-      margin: 0 -5px;
-    }
     .grade-history-item {
-      display: inline-block;
-      vertical-align: top;
-      margin: 0 5px;
-      padding: 4px;
+      margin: 0 0 5px 0;
+      padding: 4px 4px 4px 10px;
       background-color: @background-color;
       color: @dark-color-light;
-      border-radius: 16px;
-      width: 62px;
+      border-radius: 5px;
+      height: 34px;
       font-size: 14px;
-      text-align: center;
+      line-height: 26px;
 
       p:first-child {
-        height: 26px;
         white-space: nowrap;
         word-break: keep-all;
+        float: left;
       }
       p:last-child {
-        height: 26px;
-        line-height: 26px;
+        padding: 0 8px;
         border-radius: 8px;
         background-color: @white;
         font-size: 14px;
+        float: right;
       }
     }
   }

src/components/SimpleImagePreview.vue

@@ -32,19 +32,24 @@
           { [`${prefixCls}-imgs-nosition`]: nosition }
         ]"
         :style="styles"
-        v-show="!loading && curImage.imgSrc"
         v-if="modalIsShow"
       >
         <img
+          :key="curImage.imgSrc"
           :src="curImage.imgSrc"
           :alt="curImage.name"
           ref="PreviewImgDetail"
+          @load="reizeImage"
         />
       </div>
       <div :class="[`${prefixCls}-none`]" v-if="!curImage.imgSrc">
         <Icon type="md-image" />
         <p>暂无数据</p>
       </div>
+
+      <div :class="[`${prefixCls}-loading`]" v-show="loading">
+        <Icon class="ivu-load-loop" type="ios-loading" />
+      </div>
     </div>
 
     <div :class="[`${prefixCls}-footer`]">
@@ -54,10 +59,6 @@
         </li>
       </ul>
     </div>
-
-    <div :class="[`${prefixCls}-loading`]" v-show="loading">
-      <Icon class="ivu-load-loop" type="ios-loading" />
-    </div>
   </Modal>
 </template>
 
@@ -92,25 +93,39 @@ export default {
   watch: {
     "curImage.imgSrc": {
       handler(val) {
-        if (val) this.loading = true;
+        if (val) {
+          this.loadingSetT = setTimeout(() => {
+            this.loading = true;
+          }, 300);
+          this.styles = {
+            width: "",
+            height: "",
+            top: "",
+            left: "",
+            transform: ""
+          };
+        }
       }
     }
   },
   methods: {
     visibleChange(visible) {
       if (!visible) return;
-      this.loading = true;
-      this.$nextTick(() => {
-        this.registfileLoad();
-      });
+      // this.loading = true;
+      // this.$nextTick(() => {
+      //   this.registfileLoad();
+      // });
     },
-    registfileLoad() {
+    // registfileLoad() {
+    //   const imgDom = this.$refs.PreviewImgDetail;
+    //   imgDom.onload = () => {
+    //     this.reizeImage(imgDom);
+    //   };
+    // },
+    reizeImage() {
+      if (this.loadingSetT) clearTimeout(this.loadingSetT);
+
       const imgDom = this.$refs.PreviewImgDetail;
-      imgDom.onload = () => {
-        this.rezizeImage(imgDom);
-      };
-    },
-    rezizeImage(imgDom) {
       const { naturalWidth, naturalHeight } = imgDom;
       const imageSize = this.getImageSizePos({
         win: {
@@ -129,14 +144,14 @@ export default {
         height: imageSize.height + "px",
         top: imageSize.top + "px",
         left: imageSize.left + "px",
-        transform: ""
+        marginLeft: "auto",
+        transform: "none"
       });
       this.transform = {
         scale: 1,
         rotate: 0
       };
       this.loading = false;
-      console.log(11);
       setTimeout(() => {
         this.nosition = false;
       }, 100);
@@ -230,6 +245,7 @@ export default {
             this.nosition = false;
           }, 100);
         }, 200);
+        // 200ms当次旋转动画持续时间
       }
     }
   }

src/modules/grading/GradingGroupManage.vue

@@ -3,7 +3,7 @@
     <div class="group-user part-box" v-if="users.length">
       <draggable class="group-user-list" group="user" :list="users">
         <Button size="small" v-for="user in users" :key="user.id">
-          {{ user.name }}
+          {{ user.loginName }}
         </Button>
       </draggable>
       <Button
@@ -33,7 +33,7 @@
                 @on-close="removeGroupUser(uindex, group)"
                 closable
               >
-                {{ user.name }}
+                {{ user.loginName }}
               </Tag>
             </draggable>
           </div>

src/modules/grading/GradingProgress.vue

@@ -57,13 +57,13 @@
             v-if="IS_LEVEL && markerProgress.length"
           >
             <tr>
-              <td>{{ kzzInfo.name }}</td>
+              <td>{{ kzzInfo.loginName }}</td>
               <td colspan="3" style="text-align:left">
                 仲裁：{{ kzzInfo.arbitrated }}
               </td>
             </tr>
             <tr v-for="(item, aindex) in markerProgress" :key="aindex">
-              <td>{{ item.markerName }}</td>
+              <td>{{ item.loginName }}</td>
               <td>
                 <progress-line
                   :sum="item.totalCount"
@@ -77,7 +77,7 @@
 
           <table class="table table-noborder" v-if="IS_SCORE">
             <tr v-for="(item, aindex) in markerProgress" :key="aindex">
-              <td>{{ item.markerName }}</td>
+              <td>{{ item.loginName }}</td>
               <td>
                 <progress-line
                   :sum="item.totalCount"

src/modules/grading/components/GradeAction.vue

@@ -98,7 +98,7 @@
           v-for="his in gradingHistory"
           :key="his.id"
         >
-          <p>{{ his.name }}</p>
+          <p>{{ his.loginName }}</p>
           <p>{{ his.value }}</p>
         </div>
       </div>
@@ -320,6 +320,7 @@ export default {
           id: item.id,
           markerId: item.markerId,
           name: item.marker,
+          loginName: item.loginName,
           value: level
         };
       });
@@ -344,7 +345,7 @@ export default {
           this.gradingHistory.map(item => {
             return {
               id: item.markerId,
-              name: item.name
+              name: item.loginName
             };
           })
         );

src/modules/login/ResetPwd.vue

@@ -14,7 +14,7 @@
       </div>
       <div class="login-form">
         <Form ref="resetForm" :model="reset" :rules="resetRules">
-          <FormItem prop="password">
+          <!-- <FormItem prop="password">
             <Input
               size="large"
               class="input-huge"
@@ -24,7 +24,7 @@
               placeholder="请输入旧密码"
               clearable
             ></Input>
-          </FormItem>
+          </FormItem> -->
           <FormItem prop="newpswd">
             <Input
               size="large"
@@ -84,7 +84,7 @@ import { resetPwd } from "@/api";
 import { password } from "@/plugins/formRules";
 
 const initModalForm = {
-  password: "",
+  // password: "",
   newpswd: "",
   renewpswd: ""
 };
@@ -107,7 +107,7 @@ export default {
         ...initModalForm
       },
       resetRules: {
-        password,
+        // password,
         newpswd: password,
         renewpswd: [
           ...password,

src/modules/main/WorkManage.vue

@@ -31,7 +31,7 @@
               size="small"
               icon="md-arrow-back"
               shape="circle"
-              @click="$router.go(-1)"
+              @click="$router.push({ name: 'OrgManage' })"
               >返回</Button
             >
           </div>

src/modules/mark/MarkDetail.vue

@@ -1,7 +1,12 @@
 <template>
   <div :class="compClasses">
     <div class="part-box-head">
-      <Form ref="FilterForm" label-position="left" inline>
+      <Form
+        class="part-box-head-left"
+        ref="FilterForm"
+        label-position="left"
+        inline
+      >
         <FormItem>
           <Select
             v-model="filter.questionId"
@@ -26,6 +31,11 @@
           >
         </FormItem>
       </Form>
+      <div class="part-box-head-right">
+        <Button icon="upload icon" shape="circle" @click="toExport"
+          >导出改档信息</Button
+        >
+      </div>
     </div>
     <mark-step
       :steps="steps"
@@ -347,6 +357,11 @@ export default {
       this.selectPaper(index);
       this.$refs.SimpleImagePreview.open();
     },
+    toExport() {
+      window.open(
+        `${this.GLOBAL.domain}/api/export/paper/${this.workId}/${this.subject}/changeLevel`
+      );
+    },
     selectPaper(index) {
       let nindex = index;
       if (!this.papers.length) {

src/modules/mark/components/MarkAction.vue

@@ -164,7 +164,7 @@
           v-for="(his, hindex) in gradingHistory"
           :key="hindex"
         >
-          <p>{{ his.name }}</p>
+          <p>{{ his.loginName }}</p>
           <p>{{ his.value }}</p>
         </div>
       </div>
@@ -400,6 +400,7 @@ export default {
         return {
           id: item.markerId,
           name: item.marker,
+          loginName: item.loginName,
           value: item.result || "未评"
         };
       });