From f0f6d1f92d231e8fb00ef44f92c0f81876a436e0 Mon Sep 17 00:00:00 2001
From: zhy <17877871893@163.com>
Date: Thu, 18 Sep 2025 19:07:26 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AD=A6=E9=99=A2=E4=BF=AE=E6=94=B9=E7=8F=AD?=
 =?UTF-8?q?=E7=BA=A7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/stuCQS/basedata/class.js              |  10 +-
 .../stuCQS/basedata/class-info/index.vue      |  20 +-
 src/views/stuCQS/basedata/class-info/xw.vue   | 321 ++++++++++++++++++
 3 files changed, 338 insertions(+), 13 deletions(-)
 create mode 100644 src/views/stuCQS/basedata/class-info/xw.vue

diff --git a/src/api/stuCQS/basedata/class.js b/src/api/stuCQS/basedata/class.js
index 606c5b1..cb5add2 100644
--- a/src/api/stuCQS/basedata/class.js
+++ b/src/api/stuCQS/basedata/class.js
@@ -1,4 +1,12 @@
-import request from '@/utils/request'
+import request from '@/utils/request';
+
+export function listDeptClass(params){
+  return request({
+    url: '/system/class/listDeptClass',
+    method: 'get',
+    params
+  })
+}
 
 export function listInSchoolClass(params){
   return request({
diff --git a/src/views/stuCQS/basedata/class-info/index.vue b/src/views/stuCQS/basedata/class-info/index.vue
index 0062c33..856802d 100644
--- a/src/views/stuCQS/basedata/class-info/index.vue
+++ b/src/views/stuCQS/basedata/class-info/index.vue
@@ -31,20 +31,18 @@
 
     <el-row :gutter="10" class="mb8">
       <el-col :span="1.5">
-        <el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleAdd"
-          v-hasPermi="['system:class:add']">新增</el-button>
+        <el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleAdd">新增</el-button>
       </el-col>
       <el-col :span="1.5">
-        <el-button type="success" plain icon="el-icon-edit" size="mini" :disabled="single" @click="handleUpdate"
-          v-hasPermi="['system:class:edit']">修改</el-button>
+        <el-button type="success" plain icon="el-icon-edit" size="mini" :disabled="single"
+          @click="handleUpdate">修改</el-button>
       </el-col>
       <el-col :span="1.5">
-        <el-button type="danger" plain icon="el-icon-delete" size="mini" :disabled="multiple" @click="handleDelete"
-          v-hasPermi="['system:class:remove']">删除</el-button>
+        <el-button type="danger" plain icon="el-icon-delete" size="mini" :disabled="multiple"
+          @click="handleDelete">删除</el-button>
       </el-col>
       <el-col :span="1.5">
-        <el-button type="warning" plain icon="el-icon-download" size="mini" @click="handleExport"
-          v-hasPermi="['system:class:export']">导出</el-button>
+        <el-button type="warning" plain icon="el-icon-download" size="mini" @click="handleExport">导出</el-button>
       </el-col>
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
@@ -60,10 +58,8 @@
       <el-table-column label="辅导员" align="center" prop="teacher.name" />
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
-          <el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)"
-            v-hasPermi="['system:class:edit']">修改</el-button>
-          <el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)"
-            v-hasPermi="['system:class:remove']">删除</el-button>
+          <el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)">修改</el-button>
+          <el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)">删除</el-button>
         </template>
       </el-table-column>
     </el-table>
diff --git a/src/views/stuCQS/basedata/class-info/xw.vue b/src/views/stuCQS/basedata/class-info/xw.vue
new file mode 100644
index 0000000..cb25a4c
--- /dev/null
+++ b/src/views/stuCQS/basedata/class-info/xw.vue
@@ -0,0 +1,321 @@
+<template>
+    <div class="app-container">
+        <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch"
+            label-width="68px">
+
+            <el-form-item label="专业" prop="majorId">
+                <el-select style="width: 400px;" filterable clearable size="mini" v-model="queryParams.majorId">
+                    <el-option v-for="(v, i) in major_list" :key="i" :value="v.majorId" :label="v.majorName">
+                    </el-option>
+                </el-select>
+            </el-form-item>
+
+            <el-form-item label="年级" prop="gradeId">
+                <!-- <el-input v-model="form.gradeId" placeholder="" /> -->
+                <el-select v-model="queryParams.gradeId" filterable clearable placeholder="请选择年级">
+                    <el-option v-for="item in gradeList" :key="item.gradeId" :label="item.gradeName"
+                        :value="item.gradeId">
+                    </el-option>
+                </el-select>
+            </el-form-item>
+            <el-form-item label="班级名称" prop="className">
+                <el-input v-model="queryParams.className" placeholder="请输入班级名称" clearable
+                    @keyup.enter.native="handleQuery" />
+            </el-form-item>
+            <!-- <el-form-item label="院系" prop="deptId">
+        <el-input v-model="queryParams.deptId" placeholder="请输入院系" clearable @keyup.enter.native="handleQuery" />
+      </el-form-item> -->
+            <el-form-item>
+                <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
+                <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
+            </el-form-item>
+        </el-form>
+
+        <el-row :gutter="10" class="mb8">
+            <el-col :span="1.5">
+                <el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleAdd">新增</el-button>
+            </el-col>
+            <el-col :span="1.5">
+                <el-button type="success" plain icon="el-icon-edit" size="mini" :disabled="single"
+                    @click="handleUpdate">修改</el-button>
+            </el-col>
+            <el-col :span="1.5">
+                <el-button type="danger" plain icon="el-icon-delete" size="mini" :disabled="multiple"
+                    @click="handleDelete">删除</el-button>
+            </el-col>
+            <el-col :span="1.5">
+                <el-button type="warning" plain icon="el-icon-download" size="mini" @click="handleExport">导出</el-button>
+            </el-col>
+            <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+        </el-row>
+
+        <el-table v-loading="loading" :data="classList" @selection-change="handleSelectionChange">
+            <el-table-column type="selection" width="55" align="center" />
+
+            <el-table-column label="专业" align="center" prop="majors.majorName" width="250" />
+            <el-table-column label="年级" align="center" prop="grade.gradeName" />
+            <el-table-column label="班级名称" align="center" prop="className" width="270" />
+            <el-table-column label="班级代码" align="center" prop="classCode" />
+            <el-table-column label="学院" align="center" prop="dept.deptName" />
+            <el-table-column label="辅导员" align="center" prop="teacher.name" />
+            <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+                <template slot-scope="scope">
+                    <el-button size="mini" type="text" icon="el-icon-edit"
+                        @click="handleUpdate(scope.row)">修改</el-button>
+                    <el-button size="mini" type="text" icon="el-icon-delete"
+                        @click="handleDelete(scope.row)">删除</el-button>
+                </template>
+            </el-table-column>
+        </el-table>
+
+        <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum"
+            :limit.sync="queryParams.pageSize" @pagination="getList" />
+
+        <!-- 添加或修改班级信息对话框 -->
+        <el-dialog :title="title" :visible.sync="open" width="600px" append-to-body>
+            <el-form ref="form" :model="form" :rules="rules" label-width="80px">
+
+                <el-form-item label="专业" prop="majorId">
+                    <el-select style="width: 400px;" filterable clearable v-model="form.majorId">
+                        <el-option v-for="(v, i) in major_list" :key="i" :value="v.majorId" :label="v.majorName">
+                        </el-option>
+                    </el-select>
+                </el-form-item>
+                <el-form-item label="年级" prop="gradeId">
+                    <!-- <el-input v-model="form.gradeId" placeholder="" /> -->
+                    <el-select v-model="form.gradeId" filterable clearable placeholder="请选择年级">
+                        <el-option v-for="item in gradeList" :key="item.gradeId" :label="item.gradeName"
+                            :value="item.gradeId">
+                        </el-option>
+                    </el-select>
+                </el-form-item>
+                <el-form-item label="班级名称" prop="className">
+                    <el-input v-model="form.className" placeholder="请输入班级名称" />
+                </el-form-item>
+                <el-form-item label="班级代码" prop="classCode">
+                    <el-input v-model="form.classCode" placeholder="请输入班级代码" />
+                </el-form-item>
+                <el-form-item label="辅导员" prop="teacherId">
+                    <el-select style="width: 300px;" v-model="form.teacherId" filterable clearable placeholder="请选择辅导员">
+                        <el-option v-for="item in TeacherNameList" :key="item.id" :label="item.tno + '--' + item.name"
+                            :value="item.id">
+                        </el-option>
+                    </el-select>
+                </el-form-item>
+            </el-form>
+            <div slot="footer" class="dialog-footer">
+                <el-button type="primary" @click="submitForm">确 定</el-button>
+                <el-button @click="cancel">取 消</el-button>
+            </div>
+        </el-dialog>
+    </div>
+</template>
+
+<script>
+import { addClass, delClass, getClass, getMajorsName, listDeptClass as listClass, updateClass } from "@/api/stuCQS/basedata/class";
+import { listGrade } from "@/api/stuCQS/basedata/grade";
+import { listTeacherName } from "@/api/stuCQS/basedata/teacher";
+
+import { listOwnMajor } from "@/api/stuCQS/info-fill/cqScore";
+import lodash from "lodash";
+export default {
+    name: "Class",
+    data() {
+        return {
+            // 遮罩层
+            loading: true,
+            // 选中数组
+            ids: [],
+            // 非单个禁用
+            single: true,
+            // 非多个禁用
+            multiple: true,
+            // 显示搜索条件
+            showSearch: true,
+            // 总条数
+            total: 0,
+            // 班级信息
+            //表格数据
+            classList: [],
+            // 弹出层标题
+            title: "",
+            // 是否显示弹出层
+            open: false,
+            // 查询参数
+            queryParams: {
+                pageNum: 1,
+                pageSize: 10,
+                majorId: null,
+                className: null,
+                deptId: null,
+                status: null,
+                gradeId: null,
+            },
+            // 表单参数
+            form: {},
+            // 表单校验
+            rules: {
+                majorId: [
+                    { required: true, message: "专业id不能为空", trigger: "blur" }
+                ],
+                className: [
+                    { required: true, message: "班级名称不能为空", trigger: "blur" }
+                ],
+                gradeId: [
+                    { required: true, message: "年级不能为空", trigger: "blur" }
+                ],
+                teacherId: [
+                    { required: true, message: "辅导员不能为空", trigger: "blur" }
+                ],
+            },
+            majorValue: null,
+            MajorsNameList: [],//专业名称集合
+            TeacherNameList: [],//辅导员名称列表
+            gradeList: [],//年级列表
+
+            major_list: [],
+        };
+    },
+    created() {
+        this.getList();
+        this.getMajorsNameList();
+        this.getTeacherNameList();
+        this.getGradeNameList();
+        this.listOwnMajor();
+    },
+    methods: {
+        async listOwnMajor() {
+            let res = await listOwnMajor();
+            if (res.code == 200) {
+                this.major_list = lodash.cloneDeep(res.data);
+            }
+        },
+        /** 查询班级信息列表 */
+        getList() {
+            this.loading = true;
+            listClass(this.queryParams).then(response => {
+                this.classList = response.rows;
+                this.total = response.total;
+                this.loading = false;
+            });
+        },
+        getMajorsNameList() {//获取专业名称列表
+            getMajorsName().then(res => {
+                this.MajorsNameList = res.data
+            })
+        },
+        getTeacherNameList() {//获取辅导员名称列表
+            listTeacherName().then(res => {
+                console.log(res)
+                this.TeacherNameList = res.data
+            })
+        },
+        getGradeNameList() {//获取年级名称列表
+            listGrade().then(res => {
+                this.gradeList = res.rows
+            })
+        },
+
+        // 取消按钮
+        cancel() {
+            this.open = false;
+            this.reset();
+        },
+        // 表单重置
+        reset() {
+            this.form = {
+                classId: null,
+                majorId: null,
+                gradeId: null,
+                className: null,
+                deptId: null,
+                teacherId: null,
+                status: null,
+                createBy: null,
+                createTime: null,
+                updateBy: null,
+                updateTime: null
+            };
+            this.resetForm("form");
+        },
+        //搜索专业选择
+        handleChange1(value) {
+            this.queryParams.majorId = value[1]
+            console.log(value);
+        },
+        //添加修改
+        handleChange2(value) {
+            this.form.majorId = value[1]
+            console.log(value);
+        },
+        /** 搜索按钮操作 */
+        handleQuery() {
+            this.queryParams.pageNum = 1;
+            this.getList();
+        },
+        /** 重置按钮操作 */
+        resetQuery() {
+            this.resetForm("queryForm");
+            this.handleQuery();
+        },
+        // 多选框选中数据
+        handleSelectionChange(selection) {
+            this.ids = selection.map(item => item.classId)
+            this.single = selection.length !== 1
+            this.multiple = !selection.length
+        },
+        /** 新增按钮操作 */
+        handleAdd() {
+            this.reset();
+            this.open = true;
+            this.title = "添加班级信息";
+        },
+        /** 修改按钮操作 */
+        handleUpdate(row) {
+            this.reset();
+            const classId = row.classId || this.ids
+            getClass(classId).then(response => {
+                this.form = response.data;
+                this.open = true;
+                this.title = "修改班级信息";
+            });
+        },
+        /** 提交按钮 */
+        submitForm() {
+            this.$refs["form"].validate(valid => {
+                if (valid) {
+                    if (this.form.classId != null) {
+                        updateClass(this.form).then(response => {
+                            this.$modal.msgSuccess("修改成功");
+                            this.open = false;
+                            this.getList();
+                        });
+                    } else {
+                        addClass(this.form).then(response => {
+                            this.$modal.msgSuccess("新增成功");
+                            this.open = false;
+                            this.getList();
+                        });
+                    }
+                }
+            });
+        },
+        /** 删除按钮操作 */
+        handleDelete(row) {
+            const classIds = row.classId || this.ids;
+            this.$modal.confirm('是否确认删除班级信息编号为"' + classIds + '"的数据项？').then(function () {
+                return delClass(classIds);
+            }).then(() => {
+                this.getList();
+                this.$modal.msgSuccess("删除成功");
+            }).catch(() => { });
+        },
+        /** 导出按钮操作 */
+        handleExport() {
+            this.download('system/class/export', {
+                ...this.queryParams
+            }, `班级信息_${new Date().getTime()}.xlsx`)
+        }
+    }
+};
+</script>