From 8d79b639547cd78d918598b74ca97291b40039c9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=B2=A9=E4=BB=9488?= <> Date: Sun, 24 May 2026 23:40:13 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E8=8A=82=E5=81=87=E6=97=A5?= =?UTF-8?q?=E7=AE=A1=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../API/Admin/YeWu/HolidayController.php | 85 ++++++++ Laravel/routes/api.php | 3 + YiJi-admin/.env.production | 8 +- YiJi-admin/src/api/api.js | 12 ++ YiJi-admin/src/router/index.js | 7 + .../src/views/AppointmentMngr/HolidayMngr.vue | 183 ++++++++++++++++++ opencode.json | 42 ---- 7 files changed, 294 insertions(+), 46 deletions(-) create mode 100644 Laravel/app/Http/Controllers/API/Admin/YeWu/HolidayController.php create mode 100644 YiJi-admin/src/views/AppointmentMngr/HolidayMngr.vue delete mode 100644 opencode.json diff --git a/Laravel/app/Http/Controllers/API/Admin/YeWu/HolidayController.php b/Laravel/app/Http/Controllers/API/Admin/YeWu/HolidayController.php new file mode 100644 index 0000000..4c75ad8 --- /dev/null +++ b/Laravel/app/Http/Controllers/API/Admin/YeWu/HolidayController.php @@ -0,0 +1,85 @@ +where('year', $searchInfo['year']); + } + if (!empty($searchInfo['type'])) { + $list = $list->where('type', $searchInfo['type']); + } + if (!empty($searchInfo['date_start'])) { + $list = $list->where('date', '>=', $searchInfo['date_start']); + } + if (!empty($searchInfo['date_end'])) { + $list = $list->where('date', '<=', $searchInfo['date_end']); + } + $count = $list->count(); + $list = $list->orderBy('date', 'desc') + ->skip(($page - 1) * $pageSize) + ->take($pageSize) + ->get(); + return \Yz::Return(true, "查询完成", ['list' => $list, 'count' => $count]); + } + + public function Save(Request $request) + { + $userid = $request->get('userid'); + $data = request('Info'); + if (empty($data['id'])) { + $exists = DB::table('s_holiday')->where('date', $data['date'])->exists(); + if ($exists) { + return \Yz::Return(false, '该日期已存在记录'); + } + $insertData = [ + 'year' => date('Y', strtotime($data['date'])), + 'date' => $data['date'], + 'type' => $data['type'], + ]; + $id = DB::table('s_holiday')->insertGetId($insertData); + if ($id) { + return \Yz::Return(true, '添加成功', $id); + } else { + return \Yz::Return(false, '添加失败'); + } + } else { + $updateData = []; + if (isset($data['date'])) { + $updateData['date'] = $data['date']; + $updateData['year'] = date('Y', strtotime($data['date'])); + } + if (isset($data['type'])) { + $updateData['type'] = $data['type']; + } + $res = DB::table('s_holiday')->where('id', $data['id'])->update($updateData); + if ($res) { + return \Yz::Return(true, '修改成功'); + } else { + return \Yz::Return(false, '修改失败'); + } + } + } + + public function Del() + { + $id = request('id'); + $res = DB::table('s_holiday')->where('id', $id)->delete(); + if ($res) { + return \Yz::Return(true, '删除成功'); + } else { + return \Yz::Return(false, '删除失败'); + } + } +} diff --git a/Laravel/routes/api.php b/Laravel/routes/api.php index f6d5fd4..170afac 100644 --- a/Laravel/routes/api.php +++ b/Laravel/routes/api.php @@ -107,6 +107,9 @@ Route::post('admin/countAppointmentType','App\Http\Controllers\API\Admin\YeWu\AppointmentTypeController@countAppointmentType');//预约渠道统计 Route::post('admin/CountMakeList','App\Http\Controllers\API\Admin\YeWu\WorkMainController@CountMakeList');//开单统计 Route::post('admin/ChangeDefaultDept','App\Http\Controllers\API\Admin\BaseInfoController@ChangeDefaultDept');//切换默认科室 + Route::post('admin/HolidayGetList','App\Http\Controllers\API\Admin\YeWu\HolidayController@GetList');//获取节假日列表 + Route::post('admin/HolidaySave','App\Http\Controllers\API\Admin\YeWu\HolidayController@Save');//保存节假日 + Route::post('admin/HolidayDel','App\Http\Controllers\API\Admin\YeWu\HolidayController@Del');//删除节假日 }); diff --git a/YiJi-admin/.env.production b/YiJi-admin/.env.production index 6777e2f..332a397 100644 --- a/YiJi-admin/.env.production +++ b/YiJi-admin/.env.production @@ -1,10 +1,10 @@ ENV = 'production' -VITE_APP_API = 'http://192.168.80.76/api/' -VITE_APP_FILE = 'http://192.168.80.76/' +VITE_APP_API_5555 = 'http://192.168.80.76/api/' +VITE_APP_FILE_5555 = 'http://192.168.80.76/' VITE_APP_API_66666666 = 'http://yiji-qhdzhongyiyuan/api/' VITE_APP_FILE_66666666 = 'http://yiji-qhdzhongyiyuan/' -VITE_APP_API_5555 = 'https://yiji.yuluo.online/api/' -VITE_APP_FILE_555555 = 'https://yiji.yuluo.online/' \ No newline at end of file +VITE_APP_API = 'https://qhdzyyyiji.cjy.net.cn/api/' +VITE_APP_FILE = 'https://qhdzyyyiji.cjy.net.cn/' \ No newline at end of file diff --git a/YiJi-admin/src/api/api.js b/YiJi-admin/src/api/api.js index a959c5c..630ac98 100644 --- a/YiJi-admin/src/api/api.js +++ b/YiJi-admin/src/api/api.js @@ -400,4 +400,16 @@ export const SaveLockedCount = (data = {}) => { //保存模板占位数量 export const SavePlanModelLockedCount = (data = {}) => { return axios({ url: import.meta.env.VITE_APP_API + 'v1/admin/SavePlanModelLockedCount', data: data }) +} +//获取节假日列表 +export const HolidayGetList = (data = {}) => { + return axios({ url: import.meta.env.VITE_APP_API + 'v1/admin/HolidayGetList', data: data }) +} +//保存节假日 +export const HolidaySave = (data = {}) => { + return axios({ url: import.meta.env.VITE_APP_API + 'v1/admin/HolidaySave', data: data }) +} +//删除节假日 +export const HolidayDel = (data = {}) => { + return axios({ url: import.meta.env.VITE_APP_API + 'v1/admin/HolidayDel', data: data }) } \ No newline at end of file diff --git a/YiJi-admin/src/router/index.js b/YiJi-admin/src/router/index.js index 213e97a..7cd121e 100644 --- a/YiJi-admin/src/router/index.js +++ b/YiJi-admin/src/router/index.js @@ -173,6 +173,13 @@ const router = createRouter({ meta: { title: '预约资源明细' } + },{ + path: '/appointmentmngr/holidayMngr', + name: 'AppointmentMngrHolidayMngr', + component: () => import('../views/AppointmentMngr/HolidayMngr.vue'), + meta: { + title: '节假日管理' + } },{ path: '/appointmentmngr/ratio', name: 'AppointmentmngrRatio', diff --git a/YiJi-admin/src/views/AppointmentMngr/HolidayMngr.vue b/YiJi-admin/src/views/AppointmentMngr/HolidayMngr.vue new file mode 100644 index 0000000..0b8f007 --- /dev/null +++ b/YiJi-admin/src/views/AppointmentMngr/HolidayMngr.vue @@ -0,0 +1,183 @@ + + + + + diff --git a/opencode.json b/opencode.json deleted file mode 100644 index 8f3ba4a..0000000 --- a/opencode.json +++ /dev/null @@ -1,42 +0,0 @@ -{ - "$schema": "https://opencode.ai/config.json", - "plugin": ["oh-my-openagent"], - "mcp": { - "playwright-server": { - "enabled": true, - "type": "local", - "command": ["npx", "-y", "@executeautomation/playwright-mcp-server"] - } - }, - "provider":{ - "minimax-yangzong": { - "npm": "@ai-sdk/anthropic", - "options": { - "baseURL": "https://api.minimaxi.com/anthropic/v1", - "apiKey": "{env:YANG_MINMAX_KEY}" - }, - "models": { - "MiniMax-M2.7": { - "name": "MiniMax-M2.7" - } - } - }, - "yan-ZhiPu": { - "options": { - "baseURL": "https://open.bigmodel.cn/api/coding/paas/v4", - "apiKey": "{env:YAN_ZHIPU_API_KEY}" - }, - "models": { - "GLM-4.7": { - "name": "GLM-4.7" - }, - "GLM-5": { - "name": "GLM-5" - }, - "GLM-5.1": { - "name": "GLM-5.1" - } - } - } - } -}