diff --git a/admin/src/app/api/aaaaaaaaaaa.ts b/admin/src/app/api/aaaaaaaaaaa.ts new file mode 100644 index 00000000..7aba5702 --- /dev/null +++ b/admin/src/app/api/aaaaaaaaaaa.ts @@ -0,0 +1,52 @@ +import request from '@/utils/request' + +// USER_CODE_BEGIN -- aaaaaaaaaaa +/** + * 获取测试列表 + * @param params + * @returns + */ +export function getAaaaaaaaaaaList(params: Record) { + return request.get(`aaaaaaaaaaa/aaaaaaaaaaa`, {params}) +} + +/** + * 获取测试详情 + * @param id 测试id + * @returns + */ +export function getAaaaaaaaaaaInfo(id: number) { + return request.get(`aaaaaaaaaaa/aaaaaaaaaaa/${id}`); +} + +/** + * 添加测试 + * @param params + * @returns + */ +export function addAaaaaaaaaaa(params: Record) { + return request.post('aaaaaaaaaaa/aaaaaaaaaaa', params, { showErrorMessage: true, showSuccessMessage: true }) +} + +/** + * 编辑测试 + * @param id + * @param params + * @returns + */ +export function editAaaaaaaaaaa(params: Record) { + return request.put(`aaaaaaaaaaa/aaaaaaaaaaa/${params.id}`, params, { showErrorMessage: true, showSuccessMessage: true }) +} + +/** + * 删除测试 + * @param id + * @returns + */ +export function deleteAaaaaaaaaaa(id: number) { + return request.delete(`aaaaaaaaaaa/aaaaaaaaaaa/${id}`, { showErrorMessage: true, showSuccessMessage: true }) +} + + + +// USER_CODE_END -- aaaaaaaaaaa diff --git a/admin/src/app/views/aaaaaaaaaaa/aaaaaaaaaaa.vue b/admin/src/app/views/aaaaaaaaaaa/aaaaaaaaaaa.vue new file mode 100644 index 00000000..50be455a --- /dev/null +++ b/admin/src/app/views/aaaaaaaaaaa/aaaaaaaaaaa.vue @@ -0,0 +1,165 @@ + + + + + diff --git a/admin/src/app/views/aaaaaaaaaaa/components/aaaaaaaaaaa-edit.vue b/admin/src/app/views/aaaaaaaaaaa/components/aaaaaaaaaaa-edit.vue new file mode 100644 index 00000000..c66a7e6f --- /dev/null +++ b/admin/src/app/views/aaaaaaaaaaa/components/aaaaaaaaaaa-edit.vue @@ -0,0 +1,163 @@ + + + + + + diff --git a/niucloud/app/api/controller/apiController/teachingResearch.php b/niucloud/app/api/controller/apiController/TeachingResearch.php similarity index 65% rename from niucloud/app/api/controller/apiController/teachingResearch.php rename to niucloud/app/api/controller/apiController/TeachingResearch.php index a350fa4d..dfddb9ea 100644 --- a/niucloud/app/api/controller/apiController/teachingResearch.php +++ b/niucloud/app/api/controller/apiController/TeachingResearch.php @@ -14,6 +14,7 @@ namespace app\api\controller\apiController; use app\dict\member\MemberLoginTypeDict; use app\Request; use app\service\api\apiService\PersonnelService; +use app\service\api\apiService\TeachingResearchService; use app\service\api\captcha\CaptchaService; use app\service\api\login\ConfigService; use app\service\api\login\LoginService; @@ -26,11 +27,26 @@ use think\Response; * Class Personnel * @package app\api\controller\apiController */ -class teachingResearch extends BaseApiService +class TeachingResearch extends BaseApiService { //教研管理列表 public function list(){ $id = $this->member_id; - dd($id); + $data = $this->request->params([ + ["table_type",0] + ]); + return success((new TeachingResearchService())->list($id,$data['table_type'])); } + + //教研管理文章详情 + public function info($id){ + return success((new TeachingResearchService())->info($id)); + } + + //获取能看的教研管理类型 + public function lookType(){ + $id = $this->member_id; + return success((new TeachingResearchService())->lookType($id)); + } + } diff --git a/niucloud/app/api/route/route.php b/niucloud/app/api/route/route.php index 7affb5ff..382c5de2 100644 --- a/niucloud/app/api/route/route.php +++ b/niucloud/app/api/route/route.php @@ -215,7 +215,12 @@ Route::group(function() { - + //教研管理文章列表 + Route::get('teachingResearch/list', 'apiController.teachingResearch/list'); + //教研管理文章详情 + Route::get('teachingResearch/info/:id', 'apiController.teachingResearch/info'); + //获取能看的教研管理类型 + Route::get('teachingResearch/lookType', 'apiController.teachingResearch/lookType'); })->middleware(ApiChannel::class) ->middleware(ApiPersonnelCheckToken::class, true) ->middleware(ApiLog::class); diff --git a/niucloud/app/service/api/apiService/TeachingResearchService.php b/niucloud/app/service/api/apiService/TeachingResearchService.php new file mode 100644 index 00000000..2ebfbc18 --- /dev/null +++ b/niucloud/app/service/api/apiService/TeachingResearchService.php @@ -0,0 +1,81 @@ +model = new Personnel(); + } + + //获取教研管理文章列表 + public function list($id,$table_type){ + $field = 'id,title,image,type,content,status,create_time,update_time,delete_time,table_type,user_permission,url'; + $order = 'id desc'; + $LessonCourseTeaching = new LessonCourseTeaching(); + $where = []; + if ($table_type) { + $where[] = ['table_type','=',$table_type]; + } + if ($id !== null && $id !== '') { + $where[] = [Db::raw("FIND_IN_SET($id, user_permission)"), '>', 0]; + } + $search_model = $LessonCourseTeaching->where($where)->field($field)->order($order); + $list = $this->pageQuery($search_model); + return $list; + } + + //获取教研管理文章详情 + public function info($id){ + $field = 'id,title,image,type,content,status,create_time,update_time,delete_time,table_type,user_permission,url'; + $LessonCourseTeaching = new LessonCourseTeaching(); + $info = $LessonCourseTeaching->field($field)->where([['id', "=", $id]])->findOrEmpty()->toArray(); + if (is_array($info) && isset($info['type']) && $info['type'] == 2 && !empty($info['url']) && is_string($info['url'])) { + $protocol = (!empty($_SERVER['HTTPS']) && $_SERVER['HTTPS'] !== 'off') ? "https://" : "http://"; + $domain = $_SERVER['HTTP_HOST'] ?? $_SERVER['SERVER_NAME'] ?? 'localhost'; + $info['url'] = $protocol . $domain . '/' . $info['url']; + } + + return $info; + } + + //获取能看的教研管理类型 + public function lookType($id){ + $LessonCourseTeaching = new LessonCourseTeaching(); + $where = []; + if ($id !== null && $id !== '') { + $where[] = [Db::raw("FIND_IN_SET($id, user_permission)"), '>', 0]; + } + $list = $LessonCourseTeaching->where($where)->distinct(true)->column('table_type'); + return $list; + } +}