zhangjie 1 年之前
父节点
当前提交
223e333cfb

+ 1 - 1
src/assets/styles/base.scss

@@ -308,7 +308,7 @@ body {
   &-tiny {
     th,
     td {
-      padding: 6px;
+      padding: 6px 10px;
     }
   }
 }

+ 15 - 8
src/modules/course/components/SelectBlueDimensionDialog.vue

@@ -99,19 +99,26 @@ export default {
         return;
       }
 
+      const dimensionIds = selectedNodes.map((item) => item.id);
+      const targetNodes = this.$refs.treeRef
+        .getCheckedNodes(false, true)
+        .filter((item) => item.children && item.children.length);
+
       this.$emit(
         "confirm",
-        selectedNodes.map((item) => {
+        targetNodes.map((item) => {
           return {
             targetId: item.id,
             targetName: item.name,
-            dimensionList: item.children.map((dimension) => {
-              return {
-                dimensionId: dimension.dimensionId,
-                dimensionCode: dimension.dimensionCode,
-                dimensionName: dimension.dimensionName,
-              };
-            }),
+            dimensionList: item.children
+              .filter((ditem) => dimensionIds.includes(ditem.id))
+              .map((dimension) => {
+                return {
+                  dimensionId: dimension.id,
+                  dimensionCode: dimension.code,
+                  dimensionName: dimension.name,
+                };
+              }),
           };
         })
       );

+ 10 - 0
src/modules/course/components/TargetReportDetail.vue

@@ -33,6 +33,16 @@
     </div>
     <div class="part-box part-box-pad">
       <table class="table table-tiny">
+        <colgroup>
+          <col width="100" />
+          <col />
+          <col width="100" />
+          <col />
+          <col width="100" />
+          <col />
+          <col width="100" />
+          <col />
+        </colgroup>
         <tr>
           <td class="td-bg">课程编码</td>
           <td>{{ commonInfo.courseCode }}</td>

+ 1 - 1
src/modules/mark/views/MarkManage.vue

@@ -33,7 +33,7 @@
         <div></div>
         <div>
           <el-button
-            v-if="checkPrivilege('button', 'import')"
+            v-if="checkPrivilege('button', 'MarkStudentImport')"
             type="primary"
             @click="toImportMarkData"
           >