commons/basic/src/main/ets/apis/YTRequest.ets

@@ -9,13 +9,15 @@ import axios, {
 } from '@ohos/axios';
 import { ContextHelper, IBestToast, ReqString, YTLog } from '../../../../Index';
 import { AppStorageKeyCollect } from '../constants';
+import { BasicType } from '../models';
 import { userInfo } from '../models/UserInfo';
+import { ytOaidUtils } from '../utils/YtOaidUtils';
 import { yTRouter } from '../utils/YTRouter';
 
 
-export const baseURL: string = 'https://hm.ytpm.net/prod-activity'
+// export const baseURL: string = 'https://hm.ytpm.net/prod-activity'
 
-// export const baseURL: string = 'http://192.168.1.160:48103'
+export const baseURL: string = 'http://192.168.1.20:25923/'
 
 export const instance = axios.create({
   baseURL,
@@ -23,12 +25,22 @@ export const instance = axios.create({
 })
 
 // 添加请求拦截器
-instance.interceptors.request.use((config: InternalAxiosRequestConfig) => {
+instance.interceptors.request.use(async (config: InternalAxiosRequestConfig) => {
 
   // 对请求数据做点什么
-  if (AppStorage.get<string>(AppStorageKeyCollect.TOKEN)) {
-    config.headers.Authorization = AppStorage.get<string>(AppStorageKeyCollect.TOKEN)
+  // if (AppStorage.get<string>(AppStorageKeyCollect.TOKEN)) {
+  //   config.headers.Authorization = AppStorage.get<string>(AppStorageKeyCollect.TOKEN)
+  // }
+
+
+  if ((config.method == 'get' || config.method == 'delete') && config.url) {
+    //TODO 这里看后端怎么写的 目前这个格式有点奇怪
+    // config.url += AppStorage.get("OAID")
+    config.params.oaid = await ytOaidUtils.getOaid()
+  } else {
+    config.data.oaid = await ytOaidUtils.getOaid()
   }
+
   YTLog.info(config.data, '请求参数')
 
   return config;
@@ -119,4 +131,3 @@ export class YTRequest {
   }
 }
 
-

commons/basic/src/main/ets/utils/ContextHelper.ets

@@ -13,6 +13,7 @@ import {
 } from '../../../../Index'
 import { identifier } from '@kit.AdsKit'
 import { BusinessError } from '@kit.BasicServicesKit'
+import { ytOaidUtils } from './YtOaidUtils'
 
 export class ContextHelper {
   private static declare _UIContext: UIContext
@@ -84,7 +85,7 @@ export class ContextHelper {
                   } else {
                     const oaid: string = data;
                     jHStartAd.init(ContextHelper.UIAbilityContext, oaid)
-                    AppStorage.setOrCreate('OAID', oaid)
+                    ytOaidUtils.setOaid(oaid)
                     YTLog.info(`succeeded in getting oaid by callback , oaid: ${oaid}`);
                   }
                 });

commons/basic/src/main/ets/utils/YtOaidUtils.ets

@@ -0,0 +1,26 @@
+
+class YtOaidUtils{
+  private messageQueue: ESObject[] =[]
+
+  getOaid(){
+    let oaid = AppStorage.get<string>('OAID')
+    if(!oaid) {
+      let p = new Promise<string>((resolve, reject) => {
+        this.messageQueue.push({resolve, reject})
+      })
+      return p
+    } else {
+      return Promise.resolve(oaid)
+    }
+  }
+
+  setOaid(oaid: string) {
+    AppStorage.setOrCreate('OAID', oaid)
+    this.messageQueue.forEach((item: ESObject) => {
+      item.resolve(oaid)
+    })
+    this.messageQueue = []
+  }
+}
+
+export const ytOaidUtils = new YtOaidUtils()

features/feature/src/main/ets/apis/ApiUrl.ets

@@ -0,0 +1,27 @@
+export class ApiUrl {
+  /**
+   * @description 新增学生信息
+   * @method POST
+   */
+  static addStudent = '/api/class/student/add';
+  /**
+   * @description 删除学生信息
+   * @method POST
+   */
+  static deleteStudent = '/api/class/student/delete';
+  /**
+   * @description 修改学生信息
+   * @method POST
+   */
+  static updateStudent = '/api/class/student/edit';
+  /**
+   * @description 获取学生信息
+   * @method GET
+   */
+  static getStudentDetail = '/api/class/student/getStudentInfo';
+  /**
+   * @description 获取学生列表
+   * @method POST
+   */
+  static getStudentList = '/api/class/student/list';
+}

features/feature/src/main/ets/apis/ClassAffairsApi.ets

@@ -0,0 +1,32 @@
+import { YTRequest } from "basic"
+import { pageQuery, pageQueryResp, studentInfo } from "../model/Index"
+import { ApiUrl } from "./ApiUrl"
+
+class ClassAffairsApi {
+  // 新增学生信息
+  addStudent(param: ESObject): Promise<ESObject>{
+    return YTRequest.post(ApiUrl.addStudent, param)
+  }
+
+  // 删除学生信息
+  deleteStudent(param: ESObject): Promise<ESObject> {
+    return YTRequest.post(ApiUrl.deleteStudent, param)
+  }
+
+  // 修改学生信息
+  updateStudent(param: ESObject): Promise<ESObject> {
+    return YTRequest.post(ApiUrl.updateStudent, param)
+  }
+
+  // 获取学生信息
+  getStudentDetail(param: ESObject): Promise<ESObject> {
+    return YTRequest.get(ApiUrl.getStudentDetail, param)
+  }
+
+  // 获取学生列表
+  getStudentList(param: pageQuery): Promise<pageQueryResp<studentInfo[]>> {
+    return YTRequest.post(ApiUrl.getStudentList, param)
+  }
+}
+
+export const classAffairApi = new ClassAffairsApi()

features/feature/src/main/ets/components/YtComp/_YtHeader.ets

@@ -6,7 +6,7 @@ import { yTRouter } from "basic"
 @ComponentV2
 export struct _YtHeader {
   @Param isShowBackComp: boolean = true
-  @Param @Require title: string
+  @Param title: string = ''
   @Param _h: Length = 54
   @Param _padding: Length = 16
 

features/feature/src/main/ets/model/Index.ets

@@ -4,4 +4,45 @@ export class undoData {
   arr?: string[]
   arr2?: Array<string[]>
   columnMode?: number
-}
+}
+
+/************* 请求接口用  *********************/
+
+// 学生信息
+export class studentInfo {
+  defaultParam?: string
+  gender?: number
+  limit?: number
+  name?: string
+  oaid?: string
+  page?: number
+  pageSizes?: number
+  total?: number
+  updateParam?: string
+  // 新增字段
+  createBy?: string
+  createTime?: string
+  updateBy?: string
+  updateTime?: string
+  studentId?: string
+}
+
+// 分页查询数据类型 - 发起
+export class pageQuery {
+  page?: number
+  pageSizes?: number
+}
+
+// 分页查询数据类型 - 返回
+export class pageQueryResp<T> {
+  records?: T[]
+  total?: string
+  size?: string
+  current?: string
+  orders?: string[]
+  optimizeCountSql?: boolean
+  searchCount?: boolean
+  maxLimit?: string
+  countId?: string
+  pages?: string
+}

features/feature/src/main/ets/model/RouterModel.ets

@@ -1,6 +1,8 @@
 // 添加学生信息页面参数
 export interface IncreaseStudentPageModel{
-  id?: string
+  id?: string,
+  name?: string
+  gender: string
 }
 
 // 可填写信息弹窗的路由参数

features/feature/src/main/ets/pages/IncreaseStudentPage.ets

@@ -1,12 +1,21 @@
 import { _YtHeader } from '../components/YtComp/_YtHeader';
 import { IncreaseStudentPageViewModel } from '../viewModel/IncreaseStudentPage';
 import { cert } from '@kit.DeviceCertificateKit';
+import { IncreaseStudentPageModel } from '../model/RouterModel';
 
 // 添加学生信息页面
 @ComponentV2
 struct IncreaseStudentPage {
   @Local vm: IncreaseStudentPageViewModel = new IncreaseStudentPageViewModel();
 
+  @Param name: string = ''
+  @Param gender: string = ''
+
+  aboutToAppear(): void {
+    this.vm.name = this.name
+    this.vm.gender = this.gender
+  }
+
   build() {
     NavDestination() {
       Column({space: 25}) {
@@ -107,13 +116,13 @@ struct IncreaseStudentPage {
   genderEnum(){
     Column() {
       Row({space:34}){
-        Text('男')
+        Text('男孩')
         Radio({group: 'sex', value: '男'})
           .checked(this.vm.gender == '男')
           .onChange(() => { this.vm._onGenderChange('男') })
       }
       .padding({ top: 10, bottom: 10})
-      .onClick(() => { this.vm._onGenderChange('男') })
+      .onClick(() => { this.vm._onGenderChange('男孩') })
 
       Divider()
         .height(1.5)
@@ -121,10 +130,10 @@ struct IncreaseStudentPage {
         .backgroundColor('#F6F6F6')
 
       Row({space:34}){
-        Text('女')
+        Text('女孩')
         Radio({group: 'sex', value: '女'})
           .checked(this.vm.gender == '女')
-          .onChange(() => { this.vm._onGenderChange('女') })
+          .onChange(() => { this.vm._onGenderChange('女孩') })
       }
       .padding({ top: 10, bottom: 10})
       .onClick(() => { this.vm._onGenderChange('女') })
@@ -135,6 +144,6 @@ struct IncreaseStudentPage {
 }
 
 @Builder
-function IncreaseStudentPageBuilder() {
-  IncreaseStudentPage()
+function IncreaseStudentPageBuilder(_1: string, param: IncreaseStudentPageModel) {
+  IncreaseStudentPage({ name: param?.name, gender: param?.gender })
 }

features/feature/src/main/ets/pages/SeatingPlanPage.ets

@@ -35,6 +35,7 @@ struct SeatingPlanPage {
                   let data: unifiedDataChannel.PlainText = new unifiedDataChannel.PlainText();
                   data.abstract = item;
                   this.vm._addUndoData()
+                  this.vm.isDragEnd = false
                   this.vm.dataSource.splice(index, 1);
                   (event as DragEvent).setData(new unifiedDataChannel.UnifiedData(data));
                 })
@@ -100,7 +101,7 @@ struct SeatingPlanPage {
                         .backgroundColor('#E7EAFF')
                         .alignItems(VerticalAlign.Center)
                         .justifyContent(FlexAlign.Center)
-                        .margin({right: this.vm.columnMode == 1 ? 14 : ((y+1)%2 == 1 ? 7 : 30)})
+                        .margin({right: this.vm.columnMode == 1 ? 14 : ((y+1)%2 == 1 ? 6 : 22)})
                         .allowDrop([uniformTypeDescriptor.UniformDataType.PLAIN_TEXT])
                         .onClick(() => { this.vm._onStudentClick(seating, x, y) })
                         .onDrop((dragEvent?: DragEvent) => {

features/feature/src/main/ets/view/FiveView.ets

@@ -78,6 +78,7 @@ export struct FiveView {
       .backgroundColor('#BFBFBF')
       .alignItems(VerticalAlign.Center)
       .justifyContent(FlexAlign.Center)
+      .borderRadius({topLeft: 15, bottomLeft: 15})
       .padding({ left: 18, top: 30, right: 18, bottom: 30 })
       .onClick(() => { this.vm._onEditTestScore() })
 
@@ -93,7 +94,7 @@ export struct FiveView {
       .padding({ left: 18, top: 30, right: 18, bottom: 30 })
       .onClick(() => { this.vm._onDeleteTestScore() })
     }
-    .borderRadius({topRight: 15, bottomRight: 15})
+    .padding({left: 5})
   }
 
 }

features/feature/src/main/ets/view/FourView.ets

@@ -33,10 +33,6 @@ export struct FourView {
                   Text(item)
                     .fontSize(20)
                     .fontWeight(500)
-
-                  Text('2025.11.10-2025.9-19')
-                    .fontSize(14)
-                    .fontColor('#666666')
                 }
                 .width("97%")
                 .borderRadius(15)
@@ -82,6 +78,7 @@ export struct FourView {
       .backgroundColor('#BFBFBF')
       .alignItems(VerticalAlign.Center)
       .justifyContent(FlexAlign.Center)
+      .borderRadius({topLeft: 15, bottomLeft: 15})
       .padding({ left: 18, top: 30, right: 18, bottom: 30 })
       .onClick(() => { this.vm._onEditTestScore() })
 
@@ -97,7 +94,7 @@ export struct FourView {
       .padding({ left: 18, top: 30, right: 18, bottom: 30 })
       .onClick(() => { this.vm._onDeleteTestScore() })
     }
-    .borderRadius({topRight: 15, bottomRight: 15})
+    .padding({left: 5})
   }
 
 }

features/feature/src/main/ets/view/MainView.ets

@@ -15,11 +15,11 @@ export struct MainView {
         title: ''
       })
 
-      // boy and gir
+      // 各性别学生人数
       Row(){
         Row({space: 42}){
-          this.circleContainer('#7186F9', '男孩', 10)
-          this.circleContainer('#FB9BC1', '女孩', 10)
+          this.circleContainer('#7186F9', '男孩', this.vm.boyNum)
+          this.circleContainer('#FB9BC1', '女孩', this.vm.girlNum)
         }
 
         Text('添加')
@@ -39,10 +39,10 @@ export struct MainView {
       // 学生列表
       Column(){
         EmptyComp({
-          isEmpty: this.vm.dataSource.length == 0
+          isEmpty: this.vm.isEmpty
         }){
           List({space: 16}){
-            ForEach(this.vm.dataSource, (item: number, index) => {
+            ForEach(this.vm.studentList, (item: number, index) => {
               ListItem(){
                 Row({space: 22}){
                   Image(item == 1 ? $r('app.media.img_BoyHead') : $r('app.media.img_GirHead'))
@@ -88,6 +88,11 @@ export struct MainView {
     .padding({top: this.vm.safeTop })
     .justifyContent(FlexAlign.Center)
     .alignItems(HorizontalAlign.Center)
+    .onVisibleAreaChange([0, 1], (e, r) => {
+      if(e && r == 1){
+        this.vm._getStudentList()
+      }
+    })
   }
 
   // 圆型容器
@@ -132,6 +137,7 @@ export struct MainView {
       .backgroundColor('#BFBFBF')
       .alignItems(VerticalAlign.Center)
       .justifyContent(FlexAlign.Center)
+      .borderRadius({topLeft: 15, bottomLeft: 15})
       .padding({ left: 18, top: 23, right: 18, bottom: 23 })
       .onClick(() => { this.vm._onEditStudent() })
 
@@ -147,7 +153,7 @@ export struct MainView {
       .padding({ left: 18, top: 23, right: 18, bottom: 23 })
       .onClick(() => { this.vm._onDeleteStudent() })
     }
-    .borderRadius({topRight: 15, bottomRight: 15})
+    .padding({left: 5})
   }
 
   @Builder

features/feature/src/main/ets/view/SecondView.ets

@@ -47,6 +47,7 @@ export struct SecondView {
                 .backgroundImage($r('app.media.seatBg'))
                 .shadow({ radius: 6, color: '#1a000000' })
                 .padding({left: 12, top: 20, right: 12, bottom: 20})
+                .onClick(() => { this.vm._onViewSeatTable() })
               }
               .align(Alignment.Center)
               .swipeAction({
@@ -81,6 +82,7 @@ export struct SecondView {
       .backgroundColor('#BFBFBF')
       .alignItems(VerticalAlign.Center)
       .justifyContent(FlexAlign.Center)
+      .borderRadius({topLeft: 15, bottomLeft: 15})
       .padding({ left: 18, top: 30, right: 18, bottom: 30 })
       .onClick(() => { this.vm._onEditSeatTable() })
 
@@ -96,7 +98,7 @@ export struct SecondView {
       .padding({ left: 18, top: 30, right: 18, bottom: 30 })
       .onClick(() => { this.vm._onDeleteSeatTable() })
     }
-    .borderRadius({topRight: 15, bottomRight: 15})
+    .padding({left: 5})
   }
 
 }

features/feature/src/main/ets/view/ThirdView.ets

@@ -4,7 +4,7 @@ import text from "@ohos.graphics.text";
 
 @ComponentV2
 export struct ThirdView {
-  @Local vm:ThirdViewModel = new ThirdViewModel()
+  vm:ThirdViewModel = new ThirdViewModel()
 
   build() {
     Column({space: 28}){

features/feature/src/main/ets/viewModel/ClassSchedulePageViewModel.ets

@@ -5,8 +5,9 @@ import { undoData } from "../model/Index"
 @ObservedV2
 export class ClassSchedulePageViewModel{
   @Trace safeTop: number = 0
+  // 7 * 12
   @Trace table: Array<string[]> = new Array(5).fill(new Array(8).fill('11'))
-  @Trace weekList: string[] = ['周一', '周二', '周三', '周四', '周五'] // ,
+  @Trace weekList: string[] = ['周一', '周二', '周三', '周四', '周五']
 
   @Trace selectX: number = -1
   @Trace selectY: number = -1
@@ -80,7 +81,6 @@ export class ClassSchedulePageViewModel{
     this.selectY = y
   }
 
-
   /**
    * 添加行
    */
@@ -101,6 +101,9 @@ export class ClassSchedulePageViewModel{
   _onAddColumn() {
     let x = this.table.length
     let y = this.table[0].length
+
+    if(y == 12) return
+
     this._addUndoData()
     for (let index = 0; index < this.table.length; index++) {
       let arr = [...this.table[index]]
@@ -144,7 +147,6 @@ export class ClassSchedulePageViewModel{
     }
   }
 
-
   /**
    *  撤销操作
    */

features/feature/src/main/ets/viewModel/IncreaseStudentPage.ets

@@ -10,6 +10,8 @@ export class IncreaseStudentPageViewModel{
   @Trace name: string = ''
   @Trace gender: string = ''
 
+  studentID?: number
+
   constructor() {
     this.safeTop = AppStorage.get(YTAvoid.SAFE_TOP_KEY) as number
     this.safeBottom = AppStorage.get(YTAvoid.SAFE_BOTTOM_KEY) as number
@@ -44,7 +46,7 @@ export class IncreaseStudentPageViewModel{
    * @returns
    */
   _onBackPressed(isDiaLog: boolean = true){
-    if(isDiaLog && (this.name || this.gender)){
+    if(isDiaLog && (this.name || this.gender) && this.studentID){
       yTRouter.router2DoubleConfirmDiaLog({
         text: '编辑内容未保存，确定离开吗？',
         color: '#7186F9'

features/feature/src/main/ets/viewModel/MainViewModel.ets

@@ -1,11 +1,25 @@
 import { YTAvoid, yTRouter } from "basic"
+import { classAffairApi } from "../apis/ClassAffairsApi"
+import { pageQuery } from "../model/Index"
 import { iRouter } from "../utils/RouterUtils"
 
 @ObservedV2
 export class MainViewModel{
   @Trace safeTop: number = 0
+  // 学生列表
+  @Trace studentList: number[] = []
+  // 男生数量
+  @Trace boyNum: number = 10
+  // 女生数量
+  @Trace girlNum: number = 10
+  @Trace isEmpty: boolean = true
 
-  dataSource: number[] = [ 0, 0, 1, 0, 1, 0, 0, 1, 0, 1, 2, 3 ]
+  query: pageQuery = {
+    page: 1,
+    pageSizes: 10
+  }
+
+  // 线性渐变
   linear: LinearGradientOptions = {
     colors: [ ['#A9A8FF', 0.01], ['#EBF7FF', 0.3] ],
   }
@@ -29,7 +43,7 @@ export class MainViewModel{
 
   // 编辑学生
   _onEditStudent() {
-    iRouter.router2IncreaseStudentPage({ id: '12' }, (popInfo: PopInfo) => {
+    iRouter.router2IncreaseStudentPage({ name: '张三', gender: '男' }, (popInfo: PopInfo) => {
 
     })
   }
@@ -46,6 +60,12 @@ export class MainViewModel{
     })
   }
 
+  // 获取学生列表数据
+  async _getStudentList() {
+    classAffairApi.getStudentList(this.query)
+  }
+
+
   /**
    * 重写的返回逻辑
    * @returns

features/feature/src/main/ets/viewModel/SeatingPlanPageViewModel.ets

@@ -9,7 +9,7 @@ export class SeatingPlanPageViewModel{
   @Trace safeTop: number = 0
   // 学生列表
   @Trace dataSource: string[] = ['张三', '李四', '王五', '赵六', '孙七', '周八', '吴九', '小十', '张三', '李四', '王五', '赵六', '孙七', '周八', '吴九', '小十']
-  // 座位表 - 二维数组
+  // 座位表 - 二维数组 8*8
   @Trace seatingPlan: Array<string[]> = new Array(4).fill(new Array(8).fill(''))
   // 当前显示的模式： 1 - 单列  2 - 双列
   @Trace columnMode: number = 1
@@ -72,6 +72,8 @@ export class SeatingPlanPageViewModel{
       }
     }
   ]
+  // 拖拽结束了吗
+  isDragEnd: boolean = true
 
   constructor(conText: UIContext) {
     this.safeTop = AppStorage.get(YTAvoid.SAFE_TOP_KEY) as number
@@ -109,6 +111,7 @@ export class SeatingPlanPageViewModel{
    * @param value 接收到的学生
    */
   _onDrag(seat: string[], x : number, y : number, value: string){
+    this.isDragEnd = true
     let arr = [...seat]
 
     // 原位置上有学生
@@ -129,11 +132,9 @@ export class SeatingPlanPageViewModel{
    * @param event 拖拽事件传递的事件参数
    */
   _onDragEnd(event: DragEvent){
-    // onDragEnd里取到的result值在接收方onDrop设置
-    if (event.getResult() === DragResult.DRAG_SUCCESSFUL) {
-
-    } else if (event.getResult() === DragResult.DRAG_FAILED) {
-      // 拖拽结束 - 没有在接收方接收到数据， 撤销本次操作
+    // 1. 拖拽失败 - 没有在接收方接收到数据， 撤销本次操作
+    // 2. 拖拽成功 - 但是数据接收是系统控件接收，数据源并没有发生变化， 撤销本次操作
+    if (event.getResult() === DragResult.DRAG_FAILED || !this.isDragEnd) {
       this._onUndo()
     }
   }
@@ -145,6 +146,8 @@ export class SeatingPlanPageViewModel{
     let x = this.seatingPlan.length
     let y = this.seatingPlan[0].length
 
+    if(x == 8) return
+
     this._addUndoData()
     this.seatingPlan.push(new Array(y).fill(''))
   }
@@ -155,6 +158,9 @@ export class SeatingPlanPageViewModel{
   _onAddColumn() {
     let x = this.seatingPlan.length
     let y = this.seatingPlan[0].length
+
+    if(y == 13) return
+
     this._addUndoData()
     for (let index = 0; index < this.seatingPlan.length; index++) {
       let arr = [...this.seatingPlan[index]]
@@ -171,8 +177,8 @@ export class SeatingPlanPageViewModel{
     let x = this.seatingPlan.length
     let y = this.seatingPlan[0].length
 
-    if(x == 1){
-      IBestToast.show('行数不足1行')
+    if(x == 4){
+      IBestToast.show('行数不足4行')
       return
     }
     this._addUndoData()
@@ -186,8 +192,8 @@ export class SeatingPlanPageViewModel{
     let x = this.seatingPlan.length
     let y = this.seatingPlan[0].length
 
-    if(y == 1) {
-      IBestToast.show('列数不足1列')
+    if(y == 8) {
+      IBestToast.show('列数不足8列')
       return
     }
     this._addUndoData()

features/feature/src/main/ets/viewModel/SecondViewModel.ets

@@ -19,6 +19,13 @@ export class SecondViewModel{
     })
   }
 
+  // 查看座位表
+  _onViewSeatTable() {
+    iRouter.router2SeatingPlanPage({}, () => {
+
+    })
+  }
+
   // 删除
   _onDeleteSeatTable() {
     yTRouter.router2DoubleConfirmDiaLog({
@@ -36,7 +43,7 @@ export class SecondViewModel{
     iRouter.router2InputDialog({
       color: '#5668FC',
       message: '请输入座位表',
-      text: '添加座位表',
+      text: '编辑座位表',
       generics: {
         name: '座位表1',
         startDate: '2025.11.10',