bug修改

src/assets/styles/home.less

@@ -65,9 +65,9 @@
   }
   .head-logo {
     float: left;
-    margin: 0 70px 0 0;
+    margin: 0 30px 0 0;
     padding: 8px;
-    line-height: 28px;
+    line-height: 34px;
     color: @font-color-main;
     font-size: 20px;
     cursor: pointer;
@@ -77,15 +77,19 @@
     }
   }
   .head-nav {
-    margin: 0 70px 0 0;
+    margin: 0 140px 0 0;
     padding: 8px;
     line-height: 34px;
   }
   .head-user {
     float: right;
-    padding: 9px 20px 8px 0;
+    width: 130px;
+    margin-right: 10px;
+    padding: 9px 0;
+    height: 50px;
     line-height: 32px;
     color: @dark-color-light;
+    text-align: right;
   }
   .user-name {
     display: block;
@@ -94,6 +98,10 @@
     background: @background-color;
     border-radius: 16px;
     cursor: pointer;
+    max-width: 130px;
+    overflow: hidden;
+    text-overflow: ellipsis;
+    white-space: nowrap;
     > i {
       color: #bec3d1;
     }

src/components/SimpleImagePreview.vue

@@ -13,7 +13,7 @@
       <Icon type="ios-close" />
     </div>
 
-    <div :class="[`${prefixCls}-body`]" ref="ReviewBody">
+    <div :class="[`${prefixCls}-body`]" ref="ReviewBody" @click="cancel">
       <div
         :class="[`${prefixCls}-guide`, `${prefixCls}-guide-prev`]"
         @click.stop="showPrev"

src/components/UploadButton.vue

@@ -87,11 +87,16 @@ export default {
     }
   },
   data() {
+    const user = this.$ls.get("user", { token: "", id: "" });
     return {
       prefixCls,
       modalIsShow: false,
       loading: false,
-      headers: { md5: "" },
+      headers: {
+        md5: "",
+        Authorization: user.token,
+        userId: user.id
+      },
       uploadDataDict: {},
       file: null,
       res: {

src/components/ViewHeader.vue

@@ -7,20 +7,25 @@
         </slot>
       </div> -->
       <div class="head-user">
-        <Dropdown placement="bottom-end" transfer @on-click="menuClick">
-          <span class="user-name"><Icon type="md-person" size="16" /> </span>
+        <Dropdown
+          placement="bottom-end"
+          transfer
+          trigger="click"
+          @on-click="menuClick"
+        >
+          <span class="user-name"
+            ><Icon type="md-person" size="16" /> {{ username }}</span
+          >
           <DropdownMenu slot="list">
-            <DropdownItem>{{ username }}</DropdownItem>
             <DropdownItem
               v-if="showResetPwd"
               class="color-default-hover"
-              divided
               name="toResetPwd"
               >修改密码</DropdownItem
             >
             <DropdownItem
               class="color-error-hover"
-              divided
+              :divided="showResetPwd"
               name="logout"
               @click="logout"
             >

src/constants/enumerate.js

@@ -47,11 +47,11 @@ export const ROLE_TYPE = {
 export const MARK_LEADER_RIGHTS = {
   oneClickLevel: {
     name: "一键定档",
-    action: "sampling"
+    action: "leveling"
   },
   standardVolume: {
     name: "设立标准卷",
-    action: "leveling"
+    action: "sampling"
   },
   levelCallback: {
     name: "建议档位打回",

src/modules/grading/components/GradeAnalysisExport.vue

@@ -107,9 +107,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: [canvas.toDataURL().split(",")[1]]
         },

src/modules/main/StudentManage.vue

@@ -345,14 +345,14 @@ export default {
         page: this.current - 1,
         size: this.size
       };
-      if (
-        ((datas.upload || datas.upload === 0) && !datas.subject) ||
-        (!datas.upload && datas.upload !== 0 && datas.subject)
-      ) {
-        this.$Message.error("上传状态和科目必须同时选择！");
-        return;
-      }
-      if (datas.subject === "ALL") datas.subject = null;
+      // if (
+      //   ((datas.upload || datas.upload === 0) && !datas.subject) ||
+      //   (!datas.upload && datas.upload !== 0 && datas.subject)
+      // ) {
+      //   this.$Message.error("上传状态和科目必须同时选择！");
+      //   return;
+      // }
+      if (datas.subject === "ONE") datas.subject = null;
       const data = await studentPageList(datas);
       this.students = data.data.map(student => {
         student.uploadStatus.split(",").map(status => {
@@ -393,8 +393,8 @@ export default {
         this.columns.splice(this.columns.length - 1, 0, column);
       });
       this.subjects.unshift({
-        subject: "ALL",
-        name: "全部"
+        subject: "ONE",
+        name: "只缺一科"
       });
     },
     areaChange() {