From e2900e6d244328d8acde863d83dbf07d40a407c5 Mon Sep 17 00:00:00 2001
From: "1213317725@qq.com" <1213317725@qq.com>
Date: Sat, 7 Jun 2025 21:24:27 +0800
Subject: [PATCH] 1

---
 admin/src/app/lang/zh-cn/course.course.json   | 24 +++++++++++-
 admin/src/app/views/course/course.vue         | 17 +++++++++
 admin/src/app/views/dict/components/dict.vue  | 12 +++---
 admin/src/components/editor/index.vue         |  2 +-
 .../adminapi/controller/student/Student.php   |  2 +-
 .../service/admin/student/StudentService.php  | 37 ++++++++++++++++++-
 6 files changed, 83 insertions(+), 11 deletions(-)

diff --git a/admin/src/app/lang/zh-cn/course.course.json b/admin/src/app/lang/zh-cn/course.course.json
index 036d46bf..b474ff69 100644
--- a/admin/src/app/lang/zh-cn/course.course.json
+++ b/admin/src/app/lang/zh-cn/course.course.json
@@ -25,5 +25,27 @@
   "startDate": "请选择开始时间",
   "endDate": "请选择结束时间",
   "giftSessionCount": "赠送课时",
-  "giftSessionCountPlaceholder": "请输入赠送课时"
+  "giftSessionCountPlaceholder": "请输入赠送课时",
+  "name": "字典名称",
+  "namePlaceholder": "请输入字典名称",
+  "key": "字典关键词",
+  "keyPlaceholder": "请输入字典关键词",
+  "data": "字典数据",
+  "dataPlaceholder": "请输入字典数据",
+  "memo": "备注",
+  "memoPlaceholder": "请输入备注",
+  "addDict": "添加数据字典",
+  "updateDict": "编辑数据字典",
+  "dictDeleteTips": "确定要删除该数据吗？",
+  "dictData": "数据管理",
+  "addDictData": "添加数据",
+  "editDictData": "编辑数据",
+  "dataName": "数据名称",
+  "dataNamePlaceholder": "请输入数据名称",
+  "dataValue": "数据值",
+  "dataValuePlaceholder": "请输入数据值",
+  "sortPlaceholder": "数值越大越排前",
+  "momePlaceholder": "请输入备注",
+  "createTime": "创建时间",
+  "keyFormatTips": "关键字只允许输入字母和下划线"
 }
diff --git a/admin/src/app/views/course/course.vue b/admin/src/app/views/course/course.vue
index f15bce63..58e129b3 100644
--- a/admin/src/app/views/course/course.vue
+++ b/admin/src/app/views/course/course.vue
@@ -6,6 +6,8 @@
         <el-button type="primary" @click="addEvent">
           {{ t('addCourse') }}
         </el-button>
+		
+
       </div>
 
       <el-card
@@ -45,6 +47,11 @@
             <el-button @click="resetForm(searchFormRef)">{{
               t('reset')
             }}</el-button>
+			
+			
+			<el-button type="primary" @click="dictData">
+			  添加课程类型
+			</el-button>
           </el-form-item>
         </el-form>
       </el-card>
@@ -152,6 +159,9 @@
 
       <edit ref="editCourseDialog" @complete="loadCourseList" />
 	  <contract ref="contractDialog" @complete="loadCourseList" />
+	  
+	  <dict ref="dictDialog" @complete="loadCourseList" />
+	  
     </el-card>
   </div>
 </template>
@@ -165,6 +175,7 @@ import { img } from '@/utils/common'
 import { ElMessageBox, FormInstance } from 'element-plus'
 import Edit from '@/app/views/course/components/course-edit.vue'
 import Contract from '@/app/views/course/components/change_course.vue'
+import dict from '@/app/views/dict/components/dict.vue'
 import { useRoute } from 'vue-router'
 const route = useRoute()
 const pageName = route.meta.title
@@ -189,6 +200,12 @@ let courseTable = reactive({
 })
 // const courseTypeList = useDictionary('course_type')
 
+const dictDialog: Record<string, any> | null = ref(null)
+
+const dictData = () => {
+  dictDialog.value.setFormData({id:22,name:'课程类型'})
+}
+
 
 const courseTypeList = ref([])
 const getcourseTypeList = async () => {
diff --git a/admin/src/app/views/dict/components/dict.vue b/admin/src/app/views/dict/components/dict.vue
index ef93d3ac..e414b8b4 100644
--- a/admin/src/app/views/dict/components/dict.vue
+++ b/admin/src/app/views/dict/components/dict.vue
@@ -1,28 +1,28 @@
 <template>
   <el-dialog
     v-model="showDialog"
-    :title="t('dictData')"
+    title="数据管理"
     width="60%"
     class="diy-dialog-wrap"
     :destroy-on-close="true"
   >
     <div class="mb-[10px]">
       <el-button type="primary" @click="addEvent">
-        {{ t('addDictData') }}
+        添加数据
       </el-button>
     </div>
     <el-table :data="tableDate" size="large" v-loading="loading">
-      <el-table-column :label="t('dataName')" prop="name" />
-      <el-table-column :label="t('dataValue')" prop="value" />
+      <el-table-column label="数据名称" prop="name" />
+      <el-table-column label="数据值" prop="value" />
       <el-table-column
-        :label="t('sort')"
+        label="备注"
         align="center"
         min-width="100px"
         prop="sort"
       />
       <el-table-column :label="t('memo')" prop="memo" />
       <el-table-column
-        :label="t('operation')"
+        label="操作"
         align="right"
         fixed="right"
         width="120"
diff --git a/admin/src/components/editor/index.vue b/admin/src/components/editor/index.vue
index 9c6301d0..c1e2428f 100644
--- a/admin/src/components/editor/index.vue
+++ b/admin/src/components/editor/index.vue
@@ -65,7 +65,7 @@ const editorConfig = ref({
   UEDITOR_HOME_URL:
     import.meta.env.MODE == 'development'
       ? '/public/ueditor/'
-      : '/admin/ueditor/',
+      : '/ueditor/',
   serverUrl: `${baseUrl}sys/ueditor`,
   serverHeaders,
   // 编辑器不自动被内容撑高
diff --git a/niucloud/app/adminapi/controller/student/Student.php b/niucloud/app/adminapi/controller/student/Student.php
index 2579515e..d815eac0 100644
--- a/niucloud/app/adminapi/controller/student/Student.php
+++ b/niucloud/app/adminapi/controller/student/Student.php
@@ -32,7 +32,7 @@ class Student extends BaseAdminController
              ["name",""],
              ["emergency_contact",""],
              ["contact_phone",""],
-             ["created_at",["",""]],
+             ["created_at",[]],
             ['member_label', 0],
             ["class_id",""]
         ]);
diff --git a/niucloud/app/service/admin/student/StudentService.php b/niucloud/app/service/admin/student/StudentService.php
index e651bf17..6f2b273e 100644
--- a/niucloud/app/service/admin/student/StudentService.php
+++ b/niucloud/app/service/admin/student/StudentService.php
@@ -40,12 +40,45 @@ class StudentService extends BaseAdminService
      * @param array $where
      * @return array
      */
-    public function getPage(array $where = [])
+    public function getPage(array $data = [])
     {
         $field = 'id,user_id,campus_id,class_id,name,gender,age,birthday,member_label,emergency_contact,contact_phone,note,status,created_at,updated_at,deleted_at';
         $order = 'id desc';
 
-        $search_model = $this->model->withSearch(["campus_id", "name", "emergency_contact", "contact_phone", "created_at", "member_label","class_id"], $where)->with(['customerResources', 'campus', 'classGrade'])->field($field)->order($order);
+        $where = [];
+        if($data['campus_id']){
+            $where[] = ['campus_id','=',$data['campus_id']];
+        }
+
+        if($data['name']){
+            $where[] = ['name','=',$data['name']];
+        }
+
+        if($data['emergency_contact']){
+            $where[] = ['emergency_contact','=',$data['emergency_contact']];
+        }
+
+        if($data['contact_phone']){
+            $where[] = ['contact_phone','=',$data['contact_phone']];
+        }
+
+        if($data['class_id']){
+            $where[] = ['class_id','=',$data['class_id']];
+        }
+
+        if ($data['member_label']) {
+            $where[] = ['a.member_label', 'like', "%" . $data['member_label'] . "%"];
+        }
+
+
+        $search_model = $this->model->where($where)->with(['customerResources', 'campus', 'classGrade'])->field($field)->order($order);
+
+
+        if (isset($data['created_at'][0]) && isset($data['created_at'][1])) {
+            $search_model->whereBetweenTime('created_at', $data['created_at'][0] . "00:00:00", $data['created_at'][1] . "23:59:59");
+        }
+
+
         return $this->pageQuery($search_model, function ($item, $key) {
             $item = $this->makeUp($item);
         });