From 2d99b620979de685d2cc2c96f6d28afff6ccc922 Mon Sep 17 00:00:00 2001 From: lion <120344285@qq.com> Date: Sun, 4 Jan 2026 14:28:54 +0800 Subject: [PATCH] =?UTF-8?q?=E8=AF=BE=E7=A8=8B=E6=96=B9=E5=90=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .env.development | 12 +- src/views/config/classFiles.vue | 21 +- src/views/config/teacher.vue | 31 +- src/views/course/components/editClass.vue | 20 +- src/views/course/txl.vue | 335 +++++++++++----------- vue.config.js | 2 +- 6 files changed, 220 insertions(+), 201 deletions(-) diff --git a/.env.development b/.env.development index 4050056..36edb26 100644 --- a/.env.development +++ b/.env.development @@ -2,13 +2,13 @@ ENV='development' # base api -VUE_APP_PRO_API = https://suzhoukeji-test.ali251.langye.net +#VUE_APP_PRO_API = https://suzhoukeji-test.ali251.langye.net -VUE_APP_BASE_API = https://suzhoukeji-test.ali251.langye.net +#VUE_APP_BASE_API = https://suzhoukeji-test.ali251.langye.net -VUE_APP_UPLOAD_API = https://suzhoukeji-test.ali251.langye.net/api/admin/upload-file +#VUE_APP_UPLOAD_API = https://suzhoukeji-test.ali251.langye.net/api/admin/upload-file -#VUE_APP_PRO_API = https://www.sstbc.com +VUE_APP_PRO_API = https://www.sstbc.com -#VUE_APP_BASE_API = https://wx.sstbc.com -#VUE_APP_UPLOAD_API = https://wx.sstbc.com/api/admin/upload-file +VUE_APP_BASE_API = https://wx.sstbc.com +VUE_APP_UPLOAD_API = https://wx.sstbc.com/api/admin/upload-file diff --git a/src/views/config/classFiles.vue b/src/views/config/classFiles.vue index 90b4421..53ce4fb 100644 --- a/src/views/config/classFiles.vue +++ b/src/views/config/classFiles.vue @@ -13,8 +13,8 @@
- - + +
@@ -73,8 +73,8 @@ index } from '@/api/course/courseContent.js' import { - getparameteritem - } from "@/api/system/dictionary.js" + companyConfig + } from "@/api/student/schoolmateCompany.js" export default { components: { }, @@ -84,7 +84,7 @@ direction_options: [], // 课程方向选项 select: { teacher_id: '', - direction: '', // 课程方向筛选 + direction: [], // 课程方向筛选 page: 1, page_size: 10 }, @@ -157,8 +157,8 @@ this.teachers = res.data }, async getDirectionOptions() { - const res = await getparameteritem('course_direction') - this.direction_options = res.detail + const res = await companyConfig() + this.direction_options = res.directions || [] }, pageIndexChange(e) { this.select.page = e @@ -171,7 +171,7 @@ }, resetSelect() { this.select.teacher_id = '' - this.select.direction = '' + this.select.direction = [] this.select.course = '' this.select.page = 1 this.getList() @@ -181,6 +181,7 @@ page_size: this.select.page_size, page: this.select.page, show_relation: ['course','teacher'], + direction:this.select.direction && this.select.direction.length > 0 ? this.select.direction.join(',') : '', filter: [{ key: 'file_ids', op: 'notnull', @@ -189,10 +190,6 @@ key: 'teacher_id', op: 'eq', value: this.select.teacher_id?this.select.teacher_id:'' - },{ - key: 'direction', - op: 'like', - value: this.select.direction?this.select.direction:'' }] }) this.list = res.data diff --git a/src/views/config/teacher.vue b/src/views/config/teacher.vue index d73acc4..a9fa681 100644 --- a/src/views/config/teacher.vue +++ b/src/views/config/teacher.vue @@ -5,10 +5,16 @@
-
+
+
+ + + + +
查询 重置 @@ -156,7 +162,8 @@ import addTeacher from './components/addTeacher.vue'; import { index, - destroy + destroy, + teacherConfig } from "@/api/info/teachers.js" import imports from "@/views/component/imports.vue" import * as XLSX from "xlsx"; @@ -167,6 +174,9 @@ save as saveCourseContent } from '@/api/course/courseContent.js' import { getToken } from '@/utils/auth'; + import { + companyConfig + } from "@/api/student/schoolmateCompany.js" export default { components: { addTeacher, @@ -176,10 +186,11 @@ return { select: { name: '', + direction: [], page: 1, page_size: 10, }, - + directions: [], list: [], total: 0, editingItem: null, @@ -212,6 +223,11 @@ label: '联系方式', align: 'center', width: 180, + }, { + prop: 'direction', + label: '课程方向', + align: 'center', + width: 180, },{ prop: 'course_contents', label: '排课历史', @@ -223,6 +239,7 @@ }, created() { this.getList() + this.getTeacherConfig() }, methods: { pageIndexChange(e){ @@ -237,6 +254,7 @@ resetSelect(){ this.select.name = '' + this.select.direction = [] this.select.page=1 this.getList() }, @@ -244,7 +262,8 @@ const res = await index({ page: this.select.page, page_size: this.select.page_size, - keyword: this.select.name + keyword: this.select.name, + direction: this.select.direction && this.select.direction.length > 0 ? this.select.direction.join(',') : '' // filter: [{ // key: 'name', // op: 'like', @@ -255,6 +274,10 @@ this.total = res.total }, + async getTeacherConfig() { + const res = await companyConfig() + this.directions = res.directions || [] + }, async exportExcel() { let sheetName = `授课老师${new Date().getTime().toString()}` const res = await index({ diff --git a/src/views/course/components/editClass.vue b/src/views/course/components/editClass.vue index 540e065..043e2fc 100644 --- a/src/views/course/components/editClass.vue +++ b/src/views/course/components/editClass.vue @@ -77,8 +77,8 @@ 课程方向：
- - + +
@@ -180,8 +180,8 @@ import { index as teacherIndex } from "@/api/info/teachers.js"; import addTeacher from '@/views/config/components/addTeacher.vue' import { - getparameteritem -} from "@/api/system/dictionary.js" + companyConfig + } from "@/api/student/schoolmateCompany.js" export default { mixins: [myMixins], components: { @@ -206,7 +206,7 @@ teacher_id: "", teacher_introduce: '', // 授课老师简介 theme: '', - direction: '', // 课程方向 + direction: [], // 课程方向 address: '', address_detail: '', latitude: '', @@ -235,11 +235,9 @@ this.getAllPara() }, methods: { - getAllPara() { - getparameteritem('course_direction').then(res => { - console.log("res", res) - this.direction_options = res.detail - }) + async getAllPara() { + const res = await companyConfig() + this.direction_options = res.directions || [] }, setTeachers(e) { this.teacher_options = e @@ -468,7 +466,7 @@ latitude: '', longitude: '', course_id: '', // 重置课程ID字段 - direction: '', // 重置课程方向 + direction: [], // 重置课程方向 remark: '', // 重置备注 files: [], // 重置课件列表 } diff --git a/src/views/course/txl.vue b/src/views/course/txl.vue index 8b7cbc0..ee206b2 100644 --- a/src/views/course/txl.vue +++ b/src/views/course/txl.vue @@ -8,72 +8,72 @@
-
- -
- 查询 + 查询 重置 导入 导出 @@ -94,13 +94,13 @@
课程体系：{{subjectObj.leibie}}
-