From e0f51932b7f84db9da4055f2bd9480a97160865c Mon Sep 17 00:00:00 2001
From: Vce <daisy_vce@yeah.net>
Date: Wed, 10 Apr 2024 09:31:34 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=80=83=E8=AF=95=E7=B3=BB?=
 =?UTF-8?q?=E7=BB=9F=E9=A1=B5=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../learningMaterial/learningMaterial.vue     | 31 ++++++++++++++-----
 .../subjectManagement/subjectManagement.vue   |  2 +-
 2 files changed, 25 insertions(+), 8 deletions(-)

diff --git a/src/views/projectFront/examSystem/learningMaterial/learningMaterial.vue b/src/views/projectFront/examSystem/learningMaterial/learningMaterial.vue
index 8f7f23e0..dc44072a 100644
--- a/src/views/projectFront/examSystem/learningMaterial/learningMaterial.vue
+++ b/src/views/projectFront/examSystem/learningMaterial/learningMaterial.vue
@@ -178,9 +178,14 @@
                   </div>
                   <div class="innerThree">
                     <vue-scroll>
-                      <el-checkbox-group v-model="compulsoryCheckedList" @change="handleCpsList">
-                        <el-checkbox v-for="(item,i) in compulsoryList" :key="i" :label="item.label"></el-checkbox>
-                      </el-checkbox-group>
+                      <el-table class="tables" :show-header="false" :data="compulsoryList" height="200" style="min-height:15000px">
+                        <el-table-column align="center" prop="id" label="考" width="80"></el-table-column>
+                        <el-table-column align="center"></el-table-column>
+                        <el-table-column align="center" type="selection" width="65"></el-table-column>
+                      </el-table>
+                      <!-- <el-checkbox-group v-model="cpsCheckedList" @change="handleCpsList">
+                        <el-checkbox v-for="(item) in compulsoryList" :key="item.id" :label="item.label">{{item.label}}</el-checkbox>
+                      </el-checkbox-group> -->
                       <!-- <div class="dialog-tree">
                         <el-tree :data="compulsoryTreeList" :filter-node-method="filterNode" :highlight-current="true" :check-on-click-node="false"
                           show-checkbox :props="defaultProps" node-key="sn" ref="groupTree" >
@@ -417,8 +422,20 @@ export default {
           ],
         },
       ],
-      compulsoryList: [{ id: 111, lable: '111' }],
-      electiveList: [{ id: 222, lable: '222' }],
+      cpsCheckedList:[],
+      compulsoryList: [
+        { id: 111, lable: '111' },
+        { id: 112, lable: '112' },
+        { id: 113, lable: '113' },
+        { id: 113, lable: '113' },
+        { id: 113, lable: '113' },
+        { id: 113, lable: '113' },
+      ],
+      electiveList: [
+        { id: 221, lable: '221' },
+        { id: 222, lable: '222' },
+        { id: 223, lable: '223' },
+      ],
       defaultProps: {
         // children: "list",
         children: 'children',
@@ -753,7 +770,7 @@ export default {
       }
       .tlThree {
         // border: 1px solid;
-        height: 480px;
+        height: 540px;
         .dialog-tree {
           margin: 0px 0px;
           .treeStyle();
@@ -787,7 +804,7 @@ export default {
       flex-direction: column;
       justify-content: space-around;
       .trItem {
-        // background-color: blue;
+        background-color: blue;
         height: 46%;
         margin: 0 5px;
         .trItemInner {
diff --git a/src/views/projectFront/examSystem/subjectManagement/subjectManagement.vue b/src/views/projectFront/examSystem/subjectManagement/subjectManagement.vue
index 973eed19..ab7d00a4 100644
--- a/src/views/projectFront/examSystem/subjectManagement/subjectManagement.vue
+++ b/src/views/projectFront/examSystem/subjectManagement/subjectManagement.vue
@@ -5,7 +5,7 @@
       <div class="searchBox whiteBlock">
         <el-form :inline="true" size="medium" :model="queryInfo" class="demo-form-inline">
           <el-form-item>
-            <el-button type="warning" plain @click="refreshBtn">刷新</el-button>
+            <!-- <el-button type="warning" plain @click="refreshBtn">刷新</el-button> -->
             <el-button class="expintBtn" size="medium" type="primary" @click="addBefore(1, null)">新增</el-button>
           </el-form-item>
         </el-form>