Merge branch 'master' of ssh://gitlab.dongwu-inc.com:10022/BOE/fe-manage

src/components/drawers/ChangeGroup.vue

@@ -16,15 +16,15 @@
         />
       </div>
       <div class="main">
-         <div class="onerow">将此学员移动到</div>
-         <div class="secondrow">
-            <a-select
-                v-model:value="value"
-                style="width: 264px;border-radius: 8px"
-                placeholder="好好学习"
-                :options="stugroupList"
-            />
-         </div>
+        <div class="onerow">将此学员移动到</div>
+        <div class="secondrow">
+          <a-select
+            v-model:value="value"
+            style="width: 264px; border-radius: 8px"
+            placeholder="好好学习"
+            :options="stugroupList"
+          />
+        </div>
       </div>
       <div class="btnn">
         <button class="btn1">取消</button>
@@ -32,7 +32,6 @@
       </div>
     </div>
   </a-drawer>
-  
 </template>
 
 <script>
@@ -47,23 +46,23 @@ export default {
   },
   setup(props, ctx) {
     const state = reactive({
-        stugroupList: [
-            {
-                id: "1",
-                value: "好好学习",
-                label: "好好学习",
-            },
-            {
-                id: "2",
-                value: "天天向上",
-                label: "天天向上",
-            },
-            {
-                id: "3",
-                value: "好好学习",
-                label: "好好学习",
-            },
-        ],
+      stugroupList: [
+        {
+          id: "1",
+          value: "好好学习",
+          label: "好好学习",
+        },
+        {
+          id: "2",
+          value: "天天向上",
+          label: "天天向上",
+        },
+        {
+          id: "3",
+          value: "好好学习",
+          label: "好好学习",
+        },
+      ],
     });
     const closeDrawer = () => {
       ctx.emit("update:Changevisible", false);
@@ -83,9 +82,8 @@ export default {
 };
 </script>
 
-<style lang="scss" >
+<style lang="scss">
 .changegroup {
-  
   .drawerMain {
     min-width: 600px;
     margin: 0px 32px 0px 32px;
@@ -109,25 +107,24 @@ export default {
       }
     }
     .main {
-        .onerow {
-            margin: 32px 0 32px 24px;
-            color: rgba(51, 51, 51, 1);
-            font-size: 16px;
+      .onerow {
+        margin: 32px 0 32px 24px;
+        color: rgba(51, 51, 51, 1);
+        font-size: 16px;
+      }
+      .secondrow {
+        margin-left: 24px;
+        .ant-select {
+          height: 40px;
         }
-        .secondrow {
-            margin-left: 24px;
-            .ant-select {
-                height: 40px;
-              }
-              .ant-select-selector {
-                height: 100%;
-                border-radius: 8px;
-              }
-              .ant-select-selection-search-input {
-                height: 40px;
-                
-              }
+        .ant-select-selector {
+          height: 100%;
+          border-radius: 8px;
         }
+        .ant-select-selection-search-input {
+          height: 40px;
+        }
+      }
     }
     .btnn {
       height: 72px;
@@ -161,4 +158,4 @@ export default {
     }
   }
 }
-</style>
+</style>

src/components/drawers/ProjectScore.vue

@@ -467,14 +467,11 @@ export default {
       .ant-table-tbody{
      
       .pa {
-        // left: 0;
         margin-top: 15px;
-        width: 100%;
         // height: 20px;
         // background-color: red;
         display: flex;
         justify-content: center;
-        // position: absolute;
         // bottom: 20px;
       }
     } 

src/components/drawers/StuScoreDetail.vue

@@ -23,8 +23,6 @@
                       :columns="tablecolumns"
                       :data-source="tabledata"
                       :loading="tableDataTotal === -1 ? true : false"
-        
-                      :scroll="{ x: 900, y: 560 }"
                       @expand="expandTable"
                       :pagination="false"
                     
@@ -218,16 +216,14 @@
       overflow-x: scroll;
       display: flex;
       flex-direction: column;
-  
       .header {
         height: 73px;
         border-bottom: 1px solid #e8e8e8;
         display: flex;
         justify-content: space-between;
         align-items: center;
-        // background-color: red;
         margin-bottom: 20px;
-  
+        flex-shrink: 0;
         .headerTitle {
           font-size: 18px;
           font-weight: 600;
@@ -252,6 +248,7 @@
      
   
         .tableBox {
+          padding-bottom: 100px;
           .ant-table-selection-column {
             padding: 0px !important;
             // padding-left: 45px !important;
@@ -290,15 +287,11 @@
               }
           }
           .pa {
-            // left: 0;
-            margin-top: 15px;
+            margin-top: 20px;
             width: 100%;
-            // height: 20px;
-            // background-color: red;
+            flex:1;
             display: flex;
             justify-content: center;
-            // position: absolute;
-            // bottom: 20px;
           }
         }
       }
@@ -313,7 +306,7 @@
         align-items: center;
         justify-content: center;
         box-shadow: 0px 1px 35px 0px rgba(118, 136, 166, 0.16);
-  
+        background-color: #ffffff;
         .btn1 {
           width: 100px;
           height: 40px;

src/components/drawers/TimeManage.vue

@@ -70,7 +70,7 @@
             :data-source="tabledata"
             :loading="tableDataTotal === -1 ? true : false"
             expandRowByClick="true"
-            :scroll="{ x: 900, y: 350 }"
+            :scroll="{ x: 900 }"
             @expand="expandTable"
             :pagination="false"
           />