From 6c9065ef6cb33361cff022bd6b5706cf959b4b0f Mon Sep 17 00:00:00 2001 From: wangzeyan <258785420@qq.com> Date: Sun, 18 May 2025 22:44:59 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BA=BA=E5=91=98=E5=AE=89?= =?UTF-8?q?=E6=8E=92?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- admin/src/app/api/physical_test.ts | 23 +- ...campus_person_role.campus_person_role.json | 4 +- .../app/lang/zh-cn/classroom.classroom.json | 4 +- .../zh-cn/physical_test.physical_test.json | 58 +- .../physical_test.physical_test_edit.json | 39 ++ .../campus_person_role/campus_person_role.vue | 216 ++++--- .../components/campus-person-role-edit.vue | 143 ++-- .../app/views/physical_test/physical_test.vue | 609 ++++++------------ .../physical_test/physical_test_edit.vue | 300 +++++++++ admin/src/router/index.ts | 4 +- admin/src/utils/common.ts | 32 +- .../controller/physical_test/PhysicalTest.php | 22 +- niucloud/app/adminapi/route/physical_test.php | 1 + .../app/model/physical_test/PhysicalTest.php | 160 +---- .../physical_test/PhysicalTestService.php | 2 +- 15 files changed, 766 insertions(+), 851 deletions(-) create mode 100644 admin/src/app/lang/zh-cn/physical_test.physical_test_edit.json create mode 100644 admin/src/app/views/physical_test/physical_test_edit.vue diff --git a/admin/src/app/api/physical_test.ts b/admin/src/app/api/physical_test.ts index e76fba51..130670f6 100644 --- a/admin/src/app/api/physical_test.ts +++ b/admin/src/app/api/physical_test.ts @@ -1,5 +1,7 @@ import request from '@/utils/request' + + // USER_CODE_BEGIN -- physical_test /** * 获取体测列表 @@ -7,7 +9,7 @@ import request from '@/utils/request' * @returns */ export function getPhysicalTestList(params: Record) { - return request.get(`physical_test/physical_test`, { params }) + return request.get(`physical_test/physical_test`, {params}) } /** @@ -16,7 +18,7 @@ export function getPhysicalTestList(params: Record) { * @returns */ export function getPhysicalTestInfo(id: number) { - return request.get(`physical_test/physical_test/${id}`) + return request.get(`physical_test/physical_test/${id}`); } /** @@ -25,10 +27,7 @@ export function getPhysicalTestInfo(id: number) { * @returns */ export function addPhysicalTest(params: Record) { - return request.post('physical_test/physical_test', params, { - showErrorMessage: true, - showSuccessMessage: true, - }) + return request.post('physical_test/physical_test', params, { showErrorMessage: true, showSuccessMessage: true }) } /** @@ -38,10 +37,7 @@ export function addPhysicalTest(params: Record) { * @returns */ export function editPhysicalTest(params: Record) { - return request.put(`physical_test/physical_test/${params.id}`, params, { - showErrorMessage: true, - showSuccessMessage: true, - }) + return request.put(`physical_test/physical_test/${params.id}`, params, { showErrorMessage: true, showSuccessMessage: true }) } /** @@ -50,10 +46,9 @@ export function editPhysicalTest(params: Record) { * @returns */ export function deletePhysicalTest(id: number) { - return request.delete(`physical_test/physical_test/${id}`, { - showErrorMessage: true, - showSuccessMessage: true, - }) + return request.delete(`physical_test/physical_test/${id}`, { showErrorMessage: true, showSuccessMessage: true }) } + + // USER_CODE_END -- physical_test diff --git a/admin/src/app/lang/zh-cn/campus_person_role.campus_person_role.json b/admin/src/app/lang/zh-cn/campus_person_role.campus_person_role.json index 2e9597ed..f2e771bc 100644 --- a/admin/src/app/lang/zh-cn/campus_person_role.campus_person_role.json +++ b/admin/src/app/lang/zh-cn/campus_person_role.campus_person_role.json @@ -9,8 +9,8 @@ "roleIdPlaceholder": "全部", "deptId": "部门表", "deptIdPlaceholder": "全部", - "addCampusPersonRole": "添加角色关系", - "updateCampusPersonRole": "编辑角色关系", + "addCampusPersonRole": "添加人员", + "updateCampusPersonRole": "编辑人员", "campusPersonRoleDeleteTips": "确定要删除该数据吗？", "startDate": "请选择开始时间", "endDate": "请选择结束时间" diff --git a/admin/src/app/lang/zh-cn/classroom.classroom.json b/admin/src/app/lang/zh-cn/classroom.classroom.json index 6216a9aa..45ffdf8e 100644 --- a/admin/src/app/lang/zh-cn/classroom.classroom.json +++ b/admin/src/app/lang/zh-cn/classroom.classroom.json @@ -19,8 +19,8 @@ "sortOrderPlaceholder":"请输入班级排序", "remarks":"班级备注", "remarksPlaceholder":"请输入班级备注", - "addClassroom":"添加场地管理", - "updateClassroom":"编辑场地管理", + "addClassroom":"添加班级", + "updateClassroom":"编辑班级", "classroomDeleteTips":"确定要删除该数据吗？", "startDate":"请选择开始时间", "endDate":"请选择结束时间" diff --git a/admin/src/app/lang/zh-cn/physical_test.physical_test.json b/admin/src/app/lang/zh-cn/physical_test.physical_test.json index e8661df7..287cad54 100644 --- a/admin/src/app/lang/zh-cn/physical_test.physical_test.json +++ b/admin/src/app/lang/zh-cn/physical_test.physical_test.json @@ -1,43 +1,17 @@ { - "id": "体测编号", - "idPlaceholder": "请输入体测编号", - "resourceId": "资源ID", - "resourceIdPlaceholder": "请输入资源ID", - "studentId": "学员ID", - "studentIdPlaceholder": "请输入学员ID", - "height": "身高", - "heightPlaceholder": "请输入身高", - "weight": "体重", - "weightPlaceholder": "请输入体重", - "coachId": "教练ID", - "coachIdPlaceholder": "请输入教练ID", - "createdAt": "创建时间", - "createdAtPlaceholder": "请输入创建时间", - "updatedAt": "修改时间", - "updatedAtPlaceholder": "请输入修改时间", - "seatedForwardBend": "坐位体前屈", - "seatedForwardBendPlaceholder": "请输入坐位体前屈", - "sitUps": "仰卧卷腹", - "sitUpsPlaceholder": "请输入仰卧卷腹", - "pushUps": "九十度仰卧撑", - "pushUpsPlaceholder": "请输入九十度仰卧撑", - "flamingoBalance": "火烈鸟平衡测试", - "flamingoBalancePlaceholder": "请输入火烈鸟平衡测试", - "thirtySecJump": "三十秒双脚连续跳", - "thirtySecJumpPlaceholder": "请输入三十秒双脚连续跳", - "standingLongJump": "立定跳远", - "standingLongJumpPlaceholder": "请输入立定跳远", - "agilityRun": "4乘10m灵敏折返跑", - "agilityRunPlaceholder": "请输入4乘10m灵敏折返跑", - "balanceBeam": "走平衡木", - "balanceBeamPlaceholder": "请输入走平衡木", - "tennisThrow": "网球掷远", - "tennisThrowPlaceholder": "请输入网球掷远", - "tenMeterShuttleRun": "十米往返跑", - "tenMeterShuttleRunPlaceholder": "请输入十米往返跑", - "addPhysicalTest": "添加体测", - "updatePhysicalTest": "编辑体测", - "physicalTestDeleteTips": "确定要删除该数据吗？", - "startDate": "请选择开始时间", - "endDate": "请选择结束时间" -} + "resourceId":"客户姓名", + "resourceIdPlaceholder":"请输入客户姓名", + "studentId":"学员姓名", + "studentIdPlaceholder":"请输入学员姓名", + "height":"身高", + "heightPlaceholder":"请输入身高", + "createdAt":"创建时间", + "createdAtPlaceholder":"请输入创建时间", + "updatedAt":"修改时间", + "updatedAtPlaceholder":"请输入修改时间", + "addPhysicalTest":"添加体测", + "updatePhysicalTest":"编辑体测", + "physicalTestDeleteTips":"确定要删除该数据吗？", + "startDate":"请选择开始时间", + "endDate":"请选择结束时间" +} \ No newline at end of file diff --git a/admin/src/app/lang/zh-cn/physical_test.physical_test_edit.json b/admin/src/app/lang/zh-cn/physical_test.physical_test_edit.json new file mode 100644 index 00000000..aebd1831 --- /dev/null +++ b/admin/src/app/lang/zh-cn/physical_test.physical_test_edit.json @@ -0,0 +1,39 @@ +{ + "resourceId":"客户姓名", + "studentId":"学员姓名", + "height":"身高", + "weight":"体重", + "coachId":"教练", + "createdAt":"创建时间", + "updatedAt":"修改时间", + "seatedForwardBend":"坐位体前屈", + "sitUps":"仰卧卷腹", + "pushUps":"九十度仰卧撑", + "flamingoBalance":"火烈鸟平衡测试", + "thirtySecJump":"三十秒双脚连续跳", + "standingLongJump":"立定跳远", + "agilityRun":"4乘10m灵敏折返跑", + "balanceBeam":"走平衡木", + "tennisThrow":"网球掷远", + "tenMeterShuttleRun":"十米往返跑", + "resourceIdPlaceholder":"请输入客户姓名", + "studentIdPlaceholder":"请输入学员姓名", + "heightPlaceholder":"请输入身高", + "weightPlaceholder":"请输入体重", + "coachIdPlaceholder":"请输入教练", + "createdAtPlaceholder":"请输入创建时间", + "updatedAtPlaceholder":"请输入修改时间", + "seatedForwardBendPlaceholder":"请输入坐位体前屈", + "sitUpsPlaceholder":"请输入仰卧卷腹", + "pushUpsPlaceholder":"请输入九十度仰卧撑", + "flamingoBalancePlaceholder":"请输入火烈鸟平衡测试", + "thirtySecJumpPlaceholder":"请输入三十秒双脚连续跳", + "standingLongJumpPlaceholder":"请输入立定跳远", + "agilityRunPlaceholder":"请输入4乘10m灵敏折返跑", + "balanceBeamPlaceholder":"请输入走平衡木", + "tennisThrowPlaceholder":"请输入网球掷远", + "tenMeterShuttleRunPlaceholder":"请输入十米往返跑", + "addPhysicalTest":"添加体测", + "updatePhysicalTest":"编辑体测", + "physicalTestDeleteTips":"确定要删除该体测吗？" +} \ No newline at end of file diff --git a/admin/src/app/views/campus_person_role/campus_person_role.vue b/admin/src/app/views/campus_person_role/campus_person_role.vue index 2ad6f913..88de1049 100644 --- a/admin/src/app/views/campus_person_role/campus_person_role.vue +++ b/admin/src/app/views/campus_person_role/campus_person_role.vue @@ -9,167 +9,171 @@ - - - - - + + + + + + + + + + + + + + + {{ - t('search') - }} + t('search') + }} + {{ - t('reset') - }} + t('reset') + }} +
- - + + + + + diff --git a/admin/src/app/views/physical_test/physical_test_edit.vue b/admin/src/app/views/physical_test/physical_test_edit.vue new file mode 100644 index 00000000..91dd7513 --- /dev/null +++ b/admin/src/app/views/physical_test/physical_test_edit.vue @@ -0,0 +1,300 @@ + + + + + diff --git a/admin/src/router/index.ts b/admin/src/router/index.ts index c19c1bbc..0e0ce1ca 100644 --- a/admin/src/router/index.ts +++ b/admin/src/router/index.ts @@ -1,4 +1,4 @@ -import { createRouter, createWebHistory, RouteLocationRaw, RouteLocationNormalizedLoaded } from 'vue-router' +import { createRouter, createWebHashHistory, RouteLocationRaw, RouteLocationNormalizedLoaded } from 'vue-router' import NProgress from 'nprogress' import 'nprogress/nprogress.css' import { STATIC_ROUTES, NO_LOGIN_ROUTES, ROOT_ROUTER, ADMIN_ROUTE, findFirstValidRoute } from './routers' @@ -8,7 +8,7 @@ import useUserStore from '@/stores/modules/user' import { setWindowTitle, getAppType, urlToRouteRaw } from '@/utils/common' const router = createRouter({ - history: createWebHistory(import.meta.env.BASE_URL), + history: createWebHashHistory(import.meta.env.BASE_URL), routes: [ADMIN_ROUTE, ...STATIC_ROUTES] }) diff --git a/admin/src/utils/common.ts b/admin/src/utils/common.ts index 7a153d9b..5e22b149 100644 --- a/admin/src/utils/common.ts +++ b/admin/src/utils/common.ts @@ -1,6 +1,6 @@ -import type { App } from 'vue' +import type {App} from 'vue' import * as ElementPlusIconsVue from '@element-plus/icons-vue' -import { useCssVar, useTitle } from '@vueuse/core' +import {useCssVar, useTitle} from '@vueuse/core' import colorFunction from 'css-color-function' import storage from './storage' @@ -40,7 +40,7 @@ export function setThemeColor(color: string, mode: string = 'light'): void { } Object.keys(colors[mode]).forEach((key) => { - useCssVar('--el-color-primary' + '-' + key, null).value = colorFunction.convert(`color(${ color } ${ colors[mode][key] })`) + useCssVar('--el-color-primary' + '-' + key, null).value = colorFunction.convert(`color(${color} ${colors[mode][key]})`) }) } @@ -82,7 +82,7 @@ export function getToken(): null | string { * @returns */ export function setToken(token: string): void { - storage.set({ key: 'token', data: token }) + storage.set({key: 'token', data: token}) } /** @@ -127,7 +127,7 @@ export function isUrl(str: string): boolean { * @returns */ export function img(path: string): string { - return isUrl(path) ? path : `${ import.meta.env.VITE_IMG_DOMAIN || location.origin }/${ path }` + return isUrl(path) ? path : `${import.meta.env.VITE_IMG_DOMAIN || location.origin}/${path}` } /** @@ -169,7 +169,7 @@ export function urlToRouteRaw(url: string) { query[name] = value }) - return { path, query } + return {path, query} } const isArray = (value: any) => { @@ -230,7 +230,7 @@ export function guid(len = 10, firstU = true, radix: any = null) { // 移除第一个字符,并用u替代,因为第一个字符为数值时,该guuid不能用作id或者class if (firstU) { uuid.shift() - return `u${ uuid.join('') }` + return `u${uuid.join('')}` } return uuid.join('') } @@ -305,7 +305,7 @@ export function filterDigit(event: any) { const decimalParts = event.target.value.split('.'); if (decimalParts.length > 1 && decimalParts[1].length > 2) { // 如果有小数部分且超过两位，则截取前两位 - event.target.value = `${ decimalParts[0] }.${ decimalParts[1].slice(0, 2) }`; + event.target.value = `${decimalParts[0]}.${decimalParts[1].slice(0, 2)}`; } } @@ -333,6 +333,7 @@ export function filterSpecial(event: any) { export function filterBlank(event: any) { event.target.value = event.target.value.replace(/\s/g, ''); } + export function importIconFontCss() { // const modulesFiles = {}; // import.meta.glob('@/styles/icon/official-iconfont.css', { eager: true }) // const modulesFiles = import.meta.glob('@/addon/**/assets/icon/*.css', { eager: true }) @@ -400,7 +401,7 @@ export function setTablePageStorage(page: any = 1, limit: any = 10, where: any = delete data[Object.keys(data)[0]]; } - storage.set({ key: 'tablePageStorage', data }); + storage.set({key: 'tablePageStorage', data}); } /** @@ -420,3 +421,16 @@ export function getTablePageStorage(where: any = {}) { } return data; } + +/** + * 从path字符串中获取?以后的参数 + */ +export function getQueryString(path: string, name: string) { + var reg = new RegExp('[?&]' + name + '=([^&]+)', 'i'); + var r = path.match(reg); + console.log('r', r); + if (r != null) { + return decodeURIComponent(r[1]); + } + return ''; +} \ No newline at end of file diff --git a/niucloud/app/adminapi/controller/physical_test/PhysicalTest.php b/niucloud/app/adminapi/controller/physical_test/PhysicalTest.php index 5a55a972..01c1cdcb 100644 --- a/niucloud/app/adminapi/controller/physical_test/PhysicalTest.php +++ b/niucloud/app/adminapi/controller/physical_test/PhysicalTest.php @@ -31,20 +31,8 @@ class PhysicalTest extends BaseAdminController ["resource_id",""], ["student_id",""], ["height",""], - ["weight",""], - ["coach_id",""], ["created_at",""], - ["updated_at",""], - ["seated_forward_bend",""], - ["sit_ups",""], - ["push_ups",""], - ["flamingo_balance",""], - ["thirty_sec_jump",""], - ["standing_long_jump",""], - ["agility_run",""], - ["balance_beam",""], - ["tennis_throw",""], - ["ten_meter_shuttle_run",""] + ["updated_at",""] ]); return success((new PhysicalTestService())->getPage($data)); } @@ -69,8 +57,8 @@ class PhysicalTest extends BaseAdminController ["height",0.00], ["weight",0.00], ["coach_id",0], - ["created_at",1747389000], - ["updated_at",1747389000], + ["created_at",1747576653], + ["updated_at",1747576653], ["seated_forward_bend",0.00], ["sit_ups",0.00], ["push_ups",0.00], @@ -99,8 +87,8 @@ class PhysicalTest extends BaseAdminController ["height",0.00], ["weight",0.00], ["coach_id",0], - ["created_at",1747389000], - ["updated_at",1747389000], + ["created_at",1747576653], + ["updated_at",1747576653], ["seated_forward_bend",0.00], ["sit_ups",0.00], ["push_ups",0.00], diff --git a/niucloud/app/adminapi/route/physical_test.php b/niucloud/app/adminapi/route/physical_test.php index 0cdc28f0..16006893 100644 --- a/niucloud/app/adminapi/route/physical_test.php +++ b/niucloud/app/adminapi/route/physical_test.php @@ -15,6 +15,7 @@ use app\adminapi\middleware\AdminCheckRole; use app\adminapi\middleware\AdminCheckToken; use app\adminapi\middleware\AdminLog; + // USER_CODE_BEGIN -- physical_test Route::group('physical_test', function () { diff --git a/niucloud/app/model/physical_test/PhysicalTest.php b/niucloud/app/model/physical_test/PhysicalTest.php index 8e4a2be0..97039146 100644 --- a/niucloud/app/model/physical_test/PhysicalTest.php +++ b/niucloud/app/model/physical_test/PhysicalTest.php @@ -43,19 +43,7 @@ class PhysicalTest extends BaseModel /** - * 搜索器:体测体测编号 - * @param $value - * @param $data - */ - public function searchIdAttr($query, $value, $data) - { - if ($value) { - $query->where("id", $value); - } - } - - /** - * 搜索器:体测资源ID + * 搜索器:体测客户姓名 * @param $value * @param $data */ @@ -67,7 +55,7 @@ class PhysicalTest extends BaseModel } /** - * 搜索器:体测学员ID + * 搜索器:体测学员姓名 * @param $value * @param $data */ @@ -90,30 +78,6 @@ class PhysicalTest extends BaseModel } } - /** - * 搜索器:体测体重 - * @param $value - * @param $data - */ - public function searchWeightAttr($query, $value, $data) - { - if ($value) { - $query->where("weight", $value); - } - } - - /** - * 搜索器:体测教练ID - * @param $value - * @param $data - */ - public function searchCoachIdAttr($query, $value, $data) - { - if ($value) { - $query->where("coach_id", $value); - } - } - /** * 搜索器:体测创建时间 * @param $value @@ -138,126 +102,6 @@ class PhysicalTest extends BaseModel } } - /** - * 搜索器:体测坐位体前屈 - * @param $value - * @param $data - */ - public function searchSeatedForwardBendAttr($query, $value, $data) - { - if ($value) { - $query->where("seated_forward_bend", $value); - } - } - - /** - * 搜索器:体测仰卧卷腹 - * @param $value - * @param $data - */ - public function searchSitUpsAttr($query, $value, $data) - { - if ($value) { - $query->where("sit_ups", $value); - } - } - - /** - * 搜索器:体测九十度仰卧撑 - * @param $value - * @param $data - */ - public function searchPushUpsAttr($query, $value, $data) - { - if ($value) { - $query->where("push_ups", $value); - } - } - - /** - * 搜索器:体测火烈鸟平衡测试 - * @param $value - * @param $data - */ - public function searchFlamingoBalanceAttr($query, $value, $data) - { - if ($value) { - $query->where("flamingo_balance", $value); - } - } - - /** - * 搜索器:体测三十秒双脚连续跳 - * @param $value - * @param $data - */ - public function searchThirtySecJumpAttr($query, $value, $data) - { - if ($value) { - $query->where("thirty_sec_jump", $value); - } - } - - /** - * 搜索器:体测立定跳远 - * @param $value - * @param $data - */ - public function searchStandingLongJumpAttr($query, $value, $data) - { - if ($value) { - $query->where("standing_long_jump", $value); - } - } - - /** - * 搜索器:体测4乘10m灵敏折返跑 - * @param $value - * @param $data - */ - public function searchAgilityRunAttr($query, $value, $data) - { - if ($value) { - $query->where("agility_run", $value); - } - } - - /** - * 搜索器:体测走平衡木 - * @param $value - * @param $data - */ - public function searchBalanceBeamAttr($query, $value, $data) - { - if ($value) { - $query->where("balance_beam", $value); - } - } - - /** - * 搜索器:体测网球掷远 - * @param $value - * @param $data - */ - public function searchTennisThrowAttr($query, $value, $data) - { - if ($value) { - $query->where("tennis_throw", $value); - } - } - - /** - * 搜索器:体测十米往返跑 - * @param $value - * @param $data - */ - public function searchTenMeterShuttleRunAttr($query, $value, $data) - { - if ($value) { - $query->where("ten_meter_shuttle_run", $value); - } - } - diff --git a/niucloud/app/service/admin/physical_test/PhysicalTestService.php b/niucloud/app/service/admin/physical_test/PhysicalTestService.php index c01e49d8..12ad6f23 100644 --- a/niucloud/app/service/admin/physical_test/PhysicalTestService.php +++ b/niucloud/app/service/admin/physical_test/PhysicalTestService.php @@ -39,7 +39,7 @@ class PhysicalTestService extends BaseAdminService $field = 'id,resource_id,student_id,height,weight,coach_id,created_at,updated_at,seated_forward_bend,sit_ups,push_ups,flamingo_balance,thirty_sec_jump,standing_long_jump,agility_run,balance_beam,tennis_throw,ten_meter_shuttle_run'; $order = 'id desc'; - $search_model = $this->model->withSearch(["id","resource_id","student_id","height","weight","coach_id","created_at","updated_at","seated_forward_bend","sit_ups","push_ups","flamingo_balance","thirty_sec_jump","standing_long_jump","agility_run","balance_beam","tennis_throw","ten_meter_shuttle_run"], $where)->field($field)->order($order); + $search_model = $this->model->withSearch(["resource_id","student_id","height","created_at","updated_at"], $where)->field($field)->order($order); $list = $this->pageQuery($search_model); return $list; }