Merge branch 'TPE/Daniel' of http://163.228.141.122:3000/TEAMMODEL/TEAMModelOS into TPE/Daniel

TEAMModelBI/ClientApp/src/view/systemConfig/NewMsg/new_msg_BatchSelect.vue

@@ -39,7 +39,8 @@
 
             <!--- 學區選單 -->
             <div v-if="selectedPath === 1">
-                <el-card style="height:780px;">
+                <!-- <el-card style="height:780px;"> -->
+                <el-card style="height:100%;">
                     <template #header>
 
                         <el-container style="display: flex; flex-direction: column;height:100px;">
@@ -65,7 +66,7 @@
 
             <!--- 地理資訊選單 -->
             <div v-if="selectedPath === 2">
-                <el-card style="height:780px;">
+                <el-card style="height:100%;">
                     <template #header>
 
                         <el-container style="display: flex; flex-direction: column;height:100px;">

TEAMModelBI/ClientApp/src/view/systemConfig/NewMsg/school_district.vue

@@ -53,7 +53,7 @@
                 </template>
 
                 <div>
-                    <el-scrollbar style="height: 300px; width:100% ;">
+                    <el-scrollbar style="height: 100%; width:100% ;">
                         <el-list style="display: flex; flex-direction: column;">
                             <el-list-item v-for="(item, index) in column3Items"
                                           :key="index"
@@ -231,7 +231,8 @@ onMounted(fetchData);
 /* 样式与原程序保持一致 */
 .list {
     width: 100%;
-    height: 650px;
+    height: 60vh;
+    /*height: 650px;*/
     border: 1px solid #ccc;
     padding: 10px;
     overflow-y: auto;
@@ -239,7 +240,7 @@ onMounted(fetchData);
 
 .list2 {
     width: 100%;
-    height: 650px;
+    height: 100%;
     border: 1px solid #ccc;
     padding: 10px;
     /*overflow-y: auto;  只差在沒有scroll */