zhangjie 10 maanden geleden
bovenliggende
commit
f18f7dca05

+ 14 - 0
src/assets/styles/base.scss

@@ -635,6 +635,20 @@ body {
     word-wrap: break-word;
     white-space: normal;
   }
+  .el-checkbox {
+    display: flex;
+    align-items: flex-start;
+    justify-content: space-between;
+  }
+  .el-checkbox__input {
+    margin-top: 4px;
+  }
+
+  .el-checkbox__label {
+    word-wrap: break-word;
+    white-space: normal;
+    word-break: break-all;
+  }
 
   .org-edit {
     flex-grow: 0;

+ 20 - 0
src/assets/styles/element-ui-costom.scss

@@ -695,6 +695,26 @@
   &.tag-spin {
     margin: 3px;
   }
+  &.tag-wrap {
+    white-space: normal;
+    min-height: 24px;
+    height: auto;
+  }
+
+  &.tag-closable {
+    position: relative;
+    padding-right: 24px;
+    min-height: 24px;
+    height: auto;
+    white-space: normal;
+
+    .el-tag__close {
+      position: absolute;
+      top: 50%;
+      right: 4px;
+      margin-top: -8px;
+    }
+  }
 }
 // el-tree
 .el-tree {

+ 1 - 0
src/modules/exam/components/taskApply/TaskPaper.vue

@@ -504,6 +504,7 @@ export default {
     ...mapMutations("exam", ["setEditType", "setExamTask", "setCurTaskApply"]),
     ...mapActions("exam", ["addPreviewLog"]),
     initData() {
+      this.user = this.$ls.get("user", {});
       this.paperAttachments = this.curTaskApply.paperAttachmentIds
         ? JSON.parse(this.curTaskApply.paperAttachmentIds)
         : [];

+ 1 - 1
src/modules/mark/components/markParam/MarkParamGroup.vue

@@ -29,7 +29,7 @@
             <el-tag
               v-for="user in scope.row.markers"
               :key="user.id"
-              class="tag-spin"
+              class="tag-spin tag-wrap"
               size="medium"
             >
               {{ user.name }}({{ user.loginName }})

+ 2 - 1
src/modules/mark/components/markParam/ModifyMarkGroup.vue

@@ -4,7 +4,7 @@
     :visible.sync="modalIsShow"
     append-to-body
     top="10vh"
-    width="900px"
+    width="94%"
     title="分组设置"
     :close-on-click-modal="false"
     :close-on-press-escape="false"
@@ -135,6 +135,7 @@
               <el-tag
                 v-for="user in selectedUsers"
                 :key="user.id"
+                class="tag-closable"
                 closable
                 :disable-transitions="false"
                 @close="toDeleteUser(user)"