Merge branch 'master' into liua

* master:
  ~
  提交
  ~
  提交

src/pages/back/xtgl/jsgl.vue

@@ -142,7 +142,7 @@ const tableData = $ref([
   </div>
 
   <div class="flex justify-end mt-10 py-4">
-    <el-pagination :page-size="10" background layout="total, prev, pager, next" :total="100" />
+    <el-pagination :page-size="10" background layout="total, prev, pager, next" :total="tableData.length" />
   </div>
 
   <el-dialog v-model="dialogVisible" append-to-body destroy-on-close>

src/pages/back/xtgl/jsqxgl.vue

@@ -56,7 +56,7 @@ const tableData = $ref([
   </div>
 
   <div class="flex justify-end mt-10 py-4">
-    <el-pagination :page-size="10" background layout="total, prev, pager, next" :total="100" />
+    <el-pagination :page-size="10" background layout="total, prev, pager, next" :total="tableData.length" />
   </div>
 
   <el-dialog v-model="dialogVisible" append-to-body destroy-on-close>

src/pages/back/xtgl/xczsgx.vue

@@ -53,7 +53,7 @@ const tableData = $ref([
   </div>
 
   <div class="flex justify-end mt-10 py-4">
-    <el-pagination :page-size="10" background layout="total, prev, pager, next" :total="100" />
+    <el-pagination :page-size="10" background layout="total, prev, pager, next" :total="tableData.length" />
   </div>
 
   <el-dialog v-model="dialogVisible" append-to-body destroy-on-close>

src/pages/back/xtgl/xqhf.vue

@@ -53,7 +53,7 @@ const tableData = $ref([
   </div>
 
   <div class="flex justify-end mt-10 py-4">
-    <el-pagination :page-size="10" background layout="total, prev, pager, next" :total="100" />
+    <el-pagination :page-size="10" background layout="total, prev, pager, next" :total="tableData.length" />
   </div>
 
   <el-dialog v-model="dialogVisible" append-to-body destroy-on-close>

src/pages/back/xtgl/yhgl.vue

@@ -60,7 +60,7 @@ const tableData = $ref([
   </div>
 
   <div class="flex justify-end mt-10 py-4">
-    <el-pagination :page-size="10" background layout="total, prev, pager, next" :total="100" />
+    <el-pagination :page-size="10" background layout="total, prev, pager, next" :total="tableData.length" />
   </div>
 
   <el-dialog v-model="dialogVisible" width="581px" title="新增/编辑" append-to-body destroy-on-close>

src/pages/back/xtgl/ysxzdfpxx.vue

@@ -3,11 +3,12 @@ const dialogVisible = $ref(false)
 const dialogData = $ref({})
 
 const tableData = $ref([
-  { a1: '枝江市团结路小学', a2: '枝江市实验中学', a3: '武杰', a4: '2022/09/09' },
-  { a1: '枝江市团结路小学', a2: '枝江市实验中学', a3: '武杰', a4: '2022/09/09' },
-  { a1: '枝江市团结路小学', a2: '枝江市实验中学', a3: '武杰', a4: '2022/09/09' },
-  { a1: '枝江市团结路小学', a2: '枝江市实验中学', a3: '武杰', a4: '2022/09/09' },
-  { a1: '枝江市团结路小学', a2: '枝江市实验中学', a3: '武杰', a4: '2022/09/09' },
+  { a1: '枝江市团结路幼儿园', a2: '枝江市实验小学', a3: '武杰', a4: '2022/09/09' },
+  { a1: '枝江市团结路幼儿园', a2: '枝江市实验小学', a3: '武杰', a4: '2022/09/09' },
+  { a1: '枝江市团结路幼儿园', a2: '枝江市实验小学', a3: '武杰', a4: '2022/09/09' },
+  { a1: '枝江市团结路幼儿园', a2: '枝江市实验小学', a3: '武杰', a4: '2022/09/09' },
+  { a1: '枝江市团结路幼儿园', a2: '枝江市实验小学', a3: '武杰', a4: '2022/09/09' },
+  { a1: '枝江市团结路幼儿园', a2: '枝江市实验小学', a3: '武杰', a4: '2022/09/09' },
 ])
 </script>
 
@@ -53,7 +54,7 @@ const tableData = $ref([
   </div>
 
   <div class="flex justify-end mt-10 py-4">
-    <el-pagination :page-size="10" background layout="total, prev, pager, next" :total="100" />
+    <el-pagination :page-size="10" background layout="total, prev, pager, next" :total="tableData.length" />
   </div>
 
   <el-dialog v-model="dialogVisible" append-to-body destroy-on-close>

src/pages/back/ymgl/lyxxgl.vue

@@ -55,6 +55,9 @@ function delData(item) {
                 </template>
             </el-table-column>
         </el-table>
+        <div class="flex justify-end mt-10 py-4 absolute bottom-0 right-10px">
+            <el-pagination :page-size="10" background layout="total, prev, pager, next" :total="tableData.length" />
+        </div>
     </div>
 </template>
 

src/pages/back/ymgl/zxgl.vue

@@ -53,6 +53,9 @@ function delData(item) {
         </template>
       </el-table-column>
     </el-table>
+    <div class="flex justify-end mt-10 py-4 absolute bottom-0 right-10px">
+      <el-pagination :page-size="10" background layout="total, prev, pager, next" :total="tableData.length" />
+    </div>
   </div>
 </template>
 

src/pages/back/zsjhgl/index.vue

@@ -5,7 +5,7 @@ let tableData = $ref([
         name: '春季枝江二中招生计划',
         school: '枝江市团结路小学',
         area: '枝江市团结路',
-        year: '2022年',
+        year: '2023年',
         season: '春季',
         system: '三年制',
         class_num: '20个',
@@ -22,16 +22,16 @@ let tableData = $ref([
         file: '枝江二中招生计划.doc',
 
     }, {
-        name: '春季枝江二中招生计划',
+        name: '秋季枝江二中招生计划',
         school: '枝江市团结路小学',
         area: '枝江市团结路',
         year: '2022年',
-        season: '春季',
+        season: '秋季',
         system: '三年制',
         class_num: '20个',
-        boy: '1621人',
-        girl: '1621人',
-        all_num: '1621人',
+        boy: '1000人',
+        girl: '1000人',
+        all_num: '2000人',
         time: '2023/01/22 12:22',
         require: '1、思想品行端正，学习态度端正； 2、有强烈的求知欲望，有积极上进的思想； 3、能遵守校规校纪，热爱班集体； 4、有强烈的集体荣誉感，自尊自强自爱。',
         target: '办学理念及培养目标 为切实推进“科教兴县”战略,大力实施“三个转变”, 我校认 真学习宣传贯彻党的十六大精神,全面贯彻“三个代表”的重要思 想, 不断深化人事制度、分配制度',
@@ -41,7 +41,7 @@ let tableData = $ref([
         bz: '报名期间，考生可自行修改网上报名信息或重新填报报名信息。',
         file: '枝江二中招生计划.doc',
     }, {
-        name: '春季枝江二中招生计划',
+        name: '春季枝江中学招生计划',
         school: '枝江市团结路小学',
         area: '枝江市团结路',
         year: '2022年',
@@ -98,7 +98,6 @@ function editData(item) {
 let detailMsg = $ref({});
 let detailDialog = $ref(false);
 function detailData(item) {
-    console.log(item);
     detailDialog = true;
     detailMsg = item;
 }
@@ -137,6 +136,9 @@ function onSubmit() {
                 </template>
             </el-table-column>
         </el-table>
+        <div class="flex justify-end mt-10 py-4 absolute bottom-0 right-10px">
+            <el-pagination :page-size="10" background layout="total, prev, pager, next" :total="tableData.length" />
+        </div>
         <el-dialog v-model="dialogVisible" title="2023年春季枝江二中招生计划" width="778px" :center="true">
             <el-form :model="form" label-width="140px" label-position="left">
                 <div class="flex justify-center">
@@ -285,42 +287,42 @@ function onSubmit() {
                     <div class="long_content flex items-center">{{ detailMsg.require }}</div>
                 </div>
             </div>
-    <div class="flex justify-center ">
-                    <div class="flex border items-center min-h-90px">
-                        <div class="bg long_label">培养目标</div>
-                        <div class="long_content flex items-center">{{ detailMsg.target }}</div>
-                    </div>
+            <div class="flex justify-center ">
+                <div class="flex border items-center min-h-90px">
+                    <div class="bg long_label">培养目标</div>
+                    <div class="long_content flex items-center">{{ detailMsg.target }}</div>
+                </div>
+            </div>
+            <div class="flex justify-center ">
+                <div class="flex border items-center min-h-90px">
+                    <div class="bg long_label">主要学校课程</div>
+                    <div class="long_content flex items-center">{{ detailMsg.course }}</div>
+                </div>
+            </div>
+            <div class="flex justify-center ">
+                <div class="flex border items-center min-h-90px">
+                    <div class="bg long_label">办学条件</div>
+                    <div class="long_content flex items-center">{{ detailMsg.bxtj }}</div>
                 </div>
-                <div class="flex justify-center ">
-                    <div class="flex border items-center min-h-90px">
-                        <div class="bg long_label">主要学校课程</div>
-                        <div class="long_content flex items-center">{{ detailMsg.course }}</div>
-                    </div>
+            </div>
+            <div class="flex justify-center ">
+                <div class="flex border items-center min-h-90px">
+                    <div class="bg long_label">毕业后去向</div>
+                    <div class="long_content flex items-center">{{ detailMsg.qx }}</div>
                 </div>
-                <div class="flex justify-center ">
-                    <div class="flex border items-center min-h-90px">
-                        <div class="bg long_label">办学条件</div>
-                        <div class="long_content flex items-center">{{ detailMsg.bxtj }}</div>
-                    </div>
+            </div>
+            <div class="flex justify-center ">
+                <div class="flex border items-center min-h-90px">
+                    <div class="bg long_label">备注</div>
+                    <div class="long_content flex items-center">{{ detailMsg.bz }}</div>
                 </div>
-                <div class="flex justify-center ">
-                    <div class="flex border items-center min-h-90px">
-                        <div class="bg long_label">毕业后去向</div>
-                        <div class="long_content flex items-center">{{ detailMsg.qx }}</div>
-                    </div>
+            </div>
+            <div class="flex justify-center ">
+                <div class="flex border items-center min-h-90px">
+                    <div class="bg long_label">附件</div>
+                    <div class="long_content flex items-center">{{ detailMsg.file }}</div>
                 </div>
-                <div class="flex justify-center ">
-                        <div class="flex border items-center min-h-90px">
-                            <div class="bg long_label">备注</div>
-                            <div class="long_content flex items-center">{{ detailMsg.bz }}</div>
-                        </div>
-                    </div>
-                    <div class="flex justify-center ">
-                        <div class="flex border items-center min-h-90px">
-                            <div class="bg long_label">附件</div>
-                            <div class="long_content flex items-center">{{ detailMsg.file }}</div>
-                        </div>
-                    </div>
+            </div>
         </el-dialog>
     </div>
 </template>