1

src/api/classroom/index.js

@@ -30,7 +30,7 @@ export function getSchoolAndRoomNav(data) {
  */
 export function getClassRoomTimeList(data) {
     return request({
-        url: '/ClassRoom/GetClassRoomTimeList',
+        url: '/ClassRoom/GetNewClassRoomTimeList',
         method: 'post',
         data
     })

src/pages/activity/activityList.vue

@@ -167,7 +167,7 @@
         <div class="col-3 ">
           <q-select @input="resetSearch" standout="bg-primary text-white" v-model="msg.SelectIsEnd"
             class="col-6 q-pr-lg q-pr-lg" :options="statusOpts" emit-value map-options label="状态"
-            @change="resetSearch" />
+             />
         </div>
       </div>
     </div>
@@ -208,12 +208,15 @@
         <template v-slot:body-cell-AgeAndPeopleNum="props">
           <q-td :props="props">
             <div>
-              <div>{{props.row.AgeLimit ==1?'不区分年龄':'区分年龄'}}</div>
-              <div v-if="props.row.AgeLimit==0">范围:{{props.row.StartAge}}岁~{{props.row.EndAge}}岁</div>
-              <div>报名人数</div>
+              <!-- <div>{{props.row.AgeLimit ==1?'不区分年龄':'区分年龄'}}</div>
+              <div v-if="props.row.AgeLimit==0">范围:{{props.row.StartAge}}岁~{{props.row.EndAge}}岁</div>-->
+              <!-- <div>报名人数</div> -->
               <div v-if="props.row.Distinguish ==1">总人数:{{props.row.ManNum}}人</div>
               <div v-if="props.row.Distinguish ==0">男性:{{props.row.ManNum}}人 <span
                   style="margin-left:10px">女性:{{props.row.WoManNum}}人</span> </div> 
+              <div >
+                已报入:{{props.row.JoinNum}}人
+              </div>
             </div>
           </q-td>
         </template>
@@ -368,7 +371,7 @@
           },
           {
             name: "AgeAndPeopleNum",
-            label: "年龄和报名人数",
+            label: "总人数/已报入",
             align: "left"
           },
           {