From 8bacff32288b0c9a0cffa866438d740d1c625c1f Mon Sep 17 00:00:00 2001
From: gjz <393355653@qq.com>
Date: Fri, 24 Jan 2025 15:45:12 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .env                                          |   20 +-
 .../collage-information/classandcourse.vue    | 1016 ------------
 .../collage-information.vue                   | 1421 +++++++++++------
 .../collage-information1.vue                  |  673 ++++++++
 .../information_schedule.vue                  |    2 +-
 src/views/login/index.vue                     |    8 +-
 .../student-information.vue                   |  212 ++-
 src/views/teach-log/teach-log.vue             |  325 ++--
 .../teacher-information.vue                   |   30 +-
 9 files changed, 1918 insertions(+), 1789 deletions(-)
 delete mode 100644 src/views/collage-information/classandcourse.vue
 create mode 100644 src/views/collage-information/collage-information1.vue

diff --git a/.env b/.env
index 9f9b342..f1c7e99 100644
--- a/.env
+++ b/.env
@@ -33,22 +33,22 @@
 # VITE_opendoorUrl=http://192.168.100.96:88
 # VITE_APP_URL=http://47.104.164.76:9386
 # VITE_opendoorUrl=http://47.104.164.76:9386  
-# VITE_APP_URL=http://192.168.1.107:89
-# VITE_APP_URL=http://192.168.1.107:89
-# VITE_APP_URL=http://47.104.164.76:10107
-# VITE_opendoorUrl=http://47.104.164.76:10107
+VITE_APP_URL=http://192.168.1.107:89
+#VITE_APP_URL=http://192.168.1.107:89
+#VITE_APP_URL=http://47.104.164.76:10107
+#VITE_opendoorUrl=http://47.104.164.76:10107
 # VITE_APP_URL=http://192.168.100.89
 # VITE_opendoorUrl=http://172.16.40.83:8099 
-VITE_APP_URL=http://172.16.10.63:80
-VITE_opendoorUrl=http://172.16.10.63:80
-VITE_EasyNVRUrl = http://47.104.164.76:8089
+# VITE_APP_URL=http://172.16.10.63:80
+#VITE_opendoorUrl=http://172.16.10.63:80
+#VITE_EasyNVRUrl = http://47.104.164.76:8089
 # VITE_EasyNVRUrl = http://192.168.100.96:18000
-VITE_socketvideoURL = https://192.168.100.97:8086/?preeid=
+#VITE_socketvideoURL = https://192.168.100.97:8086/?preeid=
 # VITE_YuanchengaxiosURL = http://192.168.1.101:9000
 # VITE_YuanchengURL = 192.168.1.101
 # VITE_YuanchengaxiosURL = http://127.0.0.1:9000
 # VITE_YuanchengURL = 127.0.0.1
-VITE_YuanchengaxiosURL = http://172.16.10.63:9000
-VITE_YuanchengURL = 172.16.10.63
+#VITE_YuanchengaxiosURL = http://172.16.10.63:9000
+#VITE_YuanchengURL = 172.16.10.63
 # VITE_YuanchengaxiosURL = http://192.168.100.96:9000
 # VITE_YuanchengURL = 192.168.100.96
\ No newline at end of file
diff --git a/src/views/collage-information/classandcourse.vue b/src/views/collage-information/classandcourse.vue
deleted file mode 100644
index 4620972..0000000
--- a/src/views/collage-information/classandcourse.vue
+++ /dev/null
@@ -1,1016 +0,0 @@
-<style lang="scss" scoped>
-@import "../table.scss";
-</style>
-<template>
-    <div>
-        <el-card>
-            <!--两个div层之间都用margin，则会自动隔开-->
-
-            <el-tabs type="border-card" v-model="queryParams.type" @tab-change="clickTabsitem">
-                <el-tab-pane label="班级" :name="0">
-                    <div class="seachbox">
-                        <el-button type="success" @click="addbox1" class="seachboxadd">
-                            <el-icon class="el-icon-left">
-                                <Plus :size="30" />
-                            </el-icon>
-                            <div> 新增班级 </div>
-                        </el-button>
-                    </div>
-                    <div class="seachbox">
-
-                        <el-input class="ml-5 seachbox_input" v-model.trim="queryParams.clname" placeholder="请输入班级名称"
-                            clearable size="small" />
-                        <el-button type="primary" @click="getclassinfoDatainfo(pageobj.pageNum)" class="seachboxadd">
-                            搜索
-                        </el-button>
-
-                    </div>
-                    <el-table :data="tableData" border stripe :header-cell-style="{ 'text-align': 'center' }"
-                        :scrollbar-always-on="true">
-                        <!-- <el-table-column type="selection" width="55" align="center" /> -->
-                        <el-table-column prop="Name" label="班级名称" align="center">
-                        </el-table-column>
-                        <el-table-column prop="MajorName" align="center" label="专业名称">
-                        </el-table-column>
-                        <el-table-column prop="CollegeName" align="center" label="学院名称">
-                        </el-table-column>
-                        <el-table-column prop="SchoolName" align="center" label="学校名称">
-                        </el-table-column>
-                        <el-table-column prop="Grade" align="center" label="年级">
-                        </el-table-column>
-                        <el-table-column prop="HeadTeacherNum" align="center" label="班主任">
-                        </el-table-column>
-                        <el-table-column label="操作" align="center" width="150" fixed="right">
-                            <template #default="scope">
-                                <el-row class="rowcenter">
-                                    <Edit-Button permission="ClassesColumns:Edit" content="编辑"
-                                        @clicknative="editclassitem(scope.row)"></Edit-Button>
-                                    <Delete-Button permission="ClassesColumns:Delete" @confirm="delclassitem(scope.row)"
-                                        content="删除"></Delete-Button>
-                                </el-row>
-                            </template>
-                        </el-table-column>
-
-                    </el-table>
-                    <div class="paginationbox">
-                        <!--内边距空一些-->
-                        <!-- 搞定 -->
-                        <el-pagination background @size-change="handleSizeChange" @current-change="handleCurrentChange"
-                            :current-page="pageobj.pageNum" :page-sizes="pageobj.pageSizeOptions"
-                            :page-size="pageobj.pageSize" layout="total, sizes, prev, pager, next"
-                            :total="pageobj.Total">
-                        </el-pagination>
-                    </div>
-                </el-tab-pane>
-                <el-tab-pane label="课程" :name="1">
-                    <div class="seachbox">
-                        <el-button type="success" @click="addbox2" class="seachboxadd">
-                            <el-icon class="el-icon-left">
-                                <Plus :size="30" />
-                            </el-icon>
-                            <div> 新增课程 </div>
-                        </el-button>
-                    </div>
-                    <div class="seachbox" style="display: flex;">
-                        <el-input class="ml-5 seachbox_input" v-model.trim="queryParams.coursename"
-                            placeholder="请输入课程级名称" clearable size="small" />
-                        <el-button class="ml-5" type="primary" style="margin-left: 10px;"
-                            @click="getCourseinfoDatainfo(pageobj.pageNum)">搜索</el-button>
-                    </div>
-                    <el-table :data="tableData" border stripe :header-cell-style="{ 'text-align': 'center' }">
-                        <!-- <el-table-column type="selection" width="55" align="center" /> -->
-                        <el-table-column prop="Name" align="center" label="课程名称">
-                        </el-table-column>
-                        <el-table-column prop="Code" align="center" label="课程编号">
-                        </el-table-column>
-                        <el-table-column prop="Type" align="center" label="课程类型">
-                        </el-table-column>
-                        <el-table-column prop="Grade" align="center" label="学分">
-                        </el-table-column>
-                        <el-table-column prop="MajorName" align="center" label="专业名称">
-                        </el-table-column>
-                        <el-table-column prop="Description" align="center" label="课程简介">
-                        </el-table-column>
-                        <el-table-column label="操作" align="center" width="150" fixed="right">
-                            <template #default="scope">
-                                <el-row class="rowcenter">
-                                    <Edit-Button permission="CourseColumns:Edit" content="编辑"
-                                        @clicknative="editCourseitem(scope.row)"></Edit-Button>
-                                    <Delete-Button permission="CourseColumns:Delete" @confirm="delCourseitem(scope.row)"
-                                        content="删除"></Delete-Button>
-                                </el-row>
-                            </template>
-                        </el-table-column>
-                    </el-table>
-                    <div class="paginationbox">
-                        <!--内边距空一些-->
-                        <!-- 搞定 -->
-                        <el-pagination background @size-change="handleSizeChange" @current-change="handleCurrentChange"
-                            :current-page="pageobj.pageNum" :page-sizes="pageobj.pageSizeOptions"
-                            :page-size="pageobj.pageSize" layout="total, sizes, prev, pager, next"
-                            :total="pageobj.Total">
-                        </el-pagination>
-                    </div>
-                </el-tab-pane>
-            </el-tabs>
-        </el-card>
-
-        <el-drawer v-model="drawerform1" :title="drawerformtitle1" :append-to-body="false">
-            <!-- 新增修改班级左侧框 -->
-            <div class="demo-drawer__content">
-                <el-form label-position="right" ref="ruleForm" :rules="rules" label-width="100px" :model="formItem">
-                    <el-form-item label="学院名称" prop="collegeId">
-                        <el-select v-model="formItem.collegeId" filterable placeholder="请选择学院" @change="classmajorList"
-                            :disabled="formItem.collegeId ? true : false">
-                            <el-option v-for="item in collegeList" :key="item.value" :label="item.name"
-                                :value="item.value"></el-option>
-                        </el-select>
-                    </el-form-item>
-                    <el-form-item label="专业名称" prop="collegeId">
-                        <el-select v-model="formItem.selectId" filterable placeholder="请选择专业"
-                            :disabled="formItem.selectId ? true : false">
-                            <el-option v-for="item in majorList" :key="item.value" :label="item.name"
-                                :value="item.value"></el-option>
-                        </el-select>
-                    </el-form-item>
-                    <el-form-item label="班级名称" prop="Name">
-                        <el-input v-model.trim="formItem.Name" placeholder="请输入班级名称" autocomplete="off"></el-input>
-                    </el-form-item>
-                    <el-form-item label="年级" prop="ClassinfoGrade">
-                        <el-input v-model.trim="formItem.ClassinfoGrade" placeholder="请输入年级"
-                            autocomplete="off"></el-input>
-                    </el-form-item>
-                    <el-form-item label="辅导员工号" prop="Counselor">
-                        <el-input v-model.trim="formItem.Counselor" placeholder="请输入辅导员工号"
-                            autocomplete="off"></el-input>
-                    </el-form-item>
-                    <el-form-item label="班主任工号" prop="HeadTeacher">
-                        <el-input v-model.trim="formItem.HeadTeacher" placeholder="请输入班主任工号"
-                            autocomplete="off"></el-input>
-                    </el-form-item>
-                </el-form>
-                <div class="demo-drawer__footer" v-if="!isedit1">
-                    <el-button type="primary" @click="submitForm('ruleForm')">提交</el-button>
-                    <el-button @click="resetForm('ruleForm')">重置</el-button>
-                </div>
-                <div class="demo-drawer__footer" v-if="isedit1">
-                    <el-button type="primary" @click="editsubmitForm('ruleForm')">提交</el-button>
-                    <el-button @click="editresetForm('ruleForm')">重置</el-button>
-                </div>
-
-            </div>
-        </el-drawer>
-
-
-        <el-drawer v-model="drawerform2" :title="drawerformtitle2" :append-to-body="false">
-            <!-- 新增修改课程左侧框 -->
-            <div class="demo-drawer__content">
-                <el-form label-position="right" ref="ruleForm2" :rules="rules2" label-width="100px" :model="formItem1">
-                    <el-form-item label="学院名称" prop="collegeId">
-                        <el-select v-model="formItem1.collegeId" filterable placeholder="请选择学院" @change="classmajorList"
-                            :disabled="formItem1.collegeId ? true : false">
-                            <el-option v-for="item in collegeList" :key="item.value" :label="item.name"
-                                :value="item.value"></el-option>
-                        </el-select>
-                    </el-form-item>
-                    <el-form-item label="专业名称" prop="collegeId">
-                        <el-select v-model="formItem1.selectId" filterable placeholder="请选择专业"
-                            :disabled="formItem1.selectId ? true : false">
-                            <el-option v-for="item in majorList" :key="item.value" :label="item.name"
-                                :value="item.value"></el-option>
-                        </el-select>
-                    </el-form-item>
-                    <el-form-item label="课程名称" prop="Name">
-                        <el-input v-model.trim="formItem1.Name" placeholder="请输入课程名称" autocomplete="off"></el-input>
-                    </el-form-item>
-                    <el-form-item label="课程类型" prop="Type">
-                        <el-input v-model.trim="formItem1.Type" placeholder="请输入课程类型" autocomplete="off"></el-input>
-                    </el-form-item>
-                    <el-form-item label="课程编号" prop="LessonsNum">
-                        <el-input-number v-model="formItem1.LessonsNum" :min="0" :max="100000"
-                            label="请输入课程编号"></el-input-number>
-                    </el-form-item>
-                    <el-form-item label="学分" prop="Grade">
-                        <el-input-number v-model="formItem1.Grade" :min="0" :max="100000"
-                            label="请输入学分"></el-input-number>
-                    </el-form-item>
-                    <el-form-item label="课程简介" prop="Description">
-
-                        <div ref="editor" id="websiteEditorElem" style="height:300px;background-color: #fff;"></div>
-                    </el-form-item>
-                </el-form>
-                <div class="demo-drawer__footer" v-if="!isedit2">
-                    <el-button type="primary" @click="submitForm2('ruleForm2')">提交</el-button>
-                    <el-button @click="resetForm2('ruleForm2')">重置</el-button>
-                </div>
-                <div class="demo-drawer__footer" v-if="isedit2">
-                    <el-button type="primary" @click="editsubmitForm2('ruleForm2')">提交</el-button>
-                    <el-button @click="editresetForm2('ruleForm2')">重置</el-button>
-                </div>
-
-            </div>
-        </el-drawer>
-    </div>
-</template>
-
-<script>
-// 引入组件
-import E from 'wangeditor';
-import { getDefaultTime } from "@/utils/common.js"
-import { getclassinfoData, getCourseinfoData, delClassinfo, delCourseinfo, getStudentlevel, postClassInfoAddinfo, postClassInfoeditinfo, getClassInfodetail, postCourseInfoAddinfo, postCourseInfoeditinfo, getCourseInfodetail } from "@/api/collegeinformation.js";
-export default {
-    name: "classandcourse",
-    components: {
-        // "year-range": YearRangePicker,
-    },
-    directives: {
-
-    },
-    data() {
-        return {
-            phoneEditor: null,
-            mtname: "",
-            mtid: "",
-            collegeId: '',
-            collegeNam: '',
-
-            queryParams: {
-                clname: '',
-                coursename: '',
-                type: 0,
-            },
-            formItem: {
-                collegeId: "",
-                selectId: "",
-                ClassinfoGrade: "",
-                Counselor: "",
-                HeadTeacher: "",
-                Name: "",
-                ClassInfoId: '',
-                Type: '',
-            },
-
-            formItem1: {
-                collegeId: "",
-                selectId: "",
-                LessonsNum: 0,
-                Name: "",
-                Type: "",
-                Grade: 0,
-                Description: "",
-                CourseId: ''
-            },
-            collegeList: [],
-            majorList: [],
-            tableData: [],
-            isedit1: false,
-            drawerform1: false,
-            drawerformtitle: "",
-            drawerformtitle1: '',
-            isedit2: false,
-            drawerform2: false,
-            drawerformtitle2: '',
-            pageobj: {
-                oldTotal: 0,
-                oldCurrent: 1,
-                Total: 0,
-                pageSize: 10,
-                pageNum: 1,
-                pageSizeOptions: [10, 20, 50, 100, 150, 200],
-            },
-            rules: {
-                Name: [
-                    { required: true, message: '请输入班级名称', trigger: 'blur' },
-                    //{ min: 3, max: 5, message: '长度在 3 到 5 个字符', trigger: 'blur' }
-                ],
-                collegeId: [
-                    { required: true, message: '请选择学院', trigger: 'blur' },
-                    //{ min: 3, max: 5, message: '长度在 3 到 5 个字符', trigger: 'blur' }
-                ],
-                selectId: [
-                    { required: true, message: '请选择专业', trigger: 'blur' },
-                    //{ min: 3, max: 5, message: '长度在 3 到 5 个字符', trigger: 'blur' }
-                ],
-            },
-            rules2: {
-                Name: [
-                    { required: true, message: '请输入课程名称', trigger: 'blur' },
-                    //{ min: 3, max: 5, message: '长度在 3 到 5 个字符', trigger: 'blur' }
-                ],
-                collegeId: [
-                    { required: true, message: '请选择学院', trigger: 'blur' },
-                    //{ min: 3, max: 5, message: '长度在 3 到 5 个字符', trigger: 'blur' }
-                ],
-                selectId: [
-                    { required: true, message: '请选择专业', trigger: 'blur' },
-                    //{ min: 3, max: 5, message: '长度在 3 到 5 个字符', trigger: 'blur' }
-                ],
-
-                Type: [
-                    {
-                        required: true, message: '请输入课程类型', trigger: 'blur'
-                    },
-                    //{ min: 3, max: 5, message: '长度在 3 到 5 个字符', trigger: 'blur' }
-                ],
-
-            },
-        };
-    },
-    computed: {
-        // 当前富文本实例
-
-    },
-    methods: {
-        classmajorList() {
-            this.getlevemajorList(this.formItem.collegeId, "c");
-        },
-        clickTabsitem(e) {
-            // 点击切换标签
-            //  debugger
-            this.pageobj.pageNum = 1;
-            this.pageobj.pageSize = 10;
-            if (this.queryParams.type == 0) {
-                this.getclassinfoDatainfo(1);//获取班级
-
-            } else {
-                this.getCourseinfoDatainfo(1);//获取课程
-            }
-
-        },
-        handleCurrentChange(e) {
-            //切换页码
-            // debugger
-            this.pageobj.pageNum = Math.ceil(e);
-            if (this.queryParams.type == 0) {
-                this.getclassinfoDatainfo(this.pageobj.pageNum);//获取班级
-
-            } else {
-                this.getCourseinfoDatainfo(this.pageobj.pageNum);//获取课程
-            }
-        },
-        handleSizeChange(e) {
-            //切换每页显示数
-            this.pageobj.pageSize = Math.ceil(e);
-            this.pageobj.pageNum = 1
-
-            if (this.queryParams.type == 0) {
-                this.getclassinfoDatainfo(this.pageobj.pageNum);//获取班级
-
-            } else {
-                this.getCourseinfoDatainfo(this.pageobj.pageNum);//获取课程
-            }
-        },
-        getlevecolegelist() {
-            //获取学院
-            getStudentlevel({ SelectCollegeList: '', isAll: false })
-                .then((res) => {
-                    this.collegeList = res;
-                    this.getlevemajorList(this.formItem.collegeId, "c");
-                })
-        },
-        getlevemajorList(id, s, isAll = false) {
-            //获取专业
-            getStudentlevel({
-                CollegeId: id,
-                Signal: s,
-                isAll: isAll,
-            })
-                .then((res) => {
-                    this.majorList = res;
-                })
-        },
-        resetForm(formName) {
-            //新增重置
-
-            this.$refs[formName].resetFields();
-            this.formItem.collegeId = Number(this.collegeId);
-            this.formItem.selectId = Number(this.mtid);
-        },
-        editresetForm(formName) {
-
-
-            this.getclinfodetail(this.formItem.ClassInfoId);
-        },
-
-        resetForm2(formName) {
-            //新增重置
-
-            this.$refs[formName].resetFields();
-            this.formItem.collegeId = Number(this.collegeId);
-            this.formItem.selectId = Number(this.mtid);
-        },
-        editresetForm2(formName) {
-
-            this.getcuinfodetail(this.formItem1, this.formItem1.CourseId);
-
-        },
-        addbox1() {
-            //新增班级信息
-            this.isedit1 = false;
-            this.drawerform1 = true;
-            //获取
-            setTimeout(() => {
-                // debugger
-                this.$data.formItem = JSON.parse(JSON.stringify(this.$options.data().formItem));
-                this.$refs['ruleForm'].resetFields();
-                this.drawerformtitle1 = '新增班级信息';
-                this.formItem.collegeId = Number(this.collegeId);
-                this.formItem.selectId = Number(this.mtid);
-                this.getlevecolegelist();//获取学院                        
-
-                //this.setcreate();//创建夫文本编辑框
-            }, 200);
-        },
-        editclassitem(info) {
-            //获取修改详情
-            //debugger
-            this.isedit1 = true;
-            this.drawerform1 = true;
-            this.getlevecolegelist();//获取学院      
-            this.getclinfodetail(info.ClassInfoId);
-            this.drawerformtitle1 = '编辑班级信息';
-        },
-        addbox2() {
-            //新增课程信息
-            this.isedit2 = false;
-            this.drawerform2 = true;
-            //获取
-            setTimeout(() => {
-                // debugger
-                this.$refs['ruleForm2'].resetFields();
-                this.drawerformtitle2 = '新增课程信息';
-                this.formItem1.collegeId = Number(this.collegeId);
-                this.formItem1.selectId = Number(this.mtid);
-                this.getlevecolegelist();//获取学院                        
-                this.setcreate();//创建夫文本编辑框
-                //this.setcreate();//创建夫文本编辑框
-            }, 200);
-        },
-        setcreate() {
-            // this.closedrawer();
-            //创建夫文本编辑框
-            // 绑定div上的IDwebsiteEditorElem
-            // editor.destroy()
-            //if ( this.phoneEditor == null) return
-            //  debugger
-            if (this.phoneEditor == null) {
-                // this.phoneEditor = new E('#websiteEditorElem')
-                this.phoneEditor = new E(this.$refs.editor)
-
-                // 获取输入的内容
-                this.phoneEditor.config.onchange = (html) => {
-                    // 打印输入的内容
-                    // console.log(html);
-                }
-                // 上传图片到服务器，base64形式
-                this.phoneEditor.config.uploadImgShowBase64 = true
-                // 隐藏网络图片
-                this.phoneEditor.config.showLinkImg = false
-                // 创建一个富文本编辑器
-                // this.phoneEditor.txt.text('');
-
-                this.phoneEditor.create()
-                this.phoneEditor.txt.clear();
-                // 富文本内容
-            } else {
-                // this.phoneEditor.txt.text('')
-                this.phoneEditor.txt.clear();
-            }
-            //编辑里面赋值还没写好
-
-
-
-        },
-        editCourseitem(info) {
-            //获取修改详情
-            //debugger
-
-            this.drawerform2 = true;
-            this.isedit2 = true;
-            this.getlevecolegelist();//获取学院      
-            this.getcuinfodetail(info, info.CourseId);
-            this.drawerformtitle2 = '编辑课程信息';
-        },
-        getclinfodetail(id) {
-            //获取编辑信息
-            getClassInfodetail({ gcid: id }).then((res) => {
-                // debugger
-                let data = res;
-                this.formItem = {
-                    collegeId: data.CollegeId,
-                    selectId: data.MajorId,
-                    ClassinfoGrade: data.Grade || '',
-                    Counselor: data.CounselorNum || '',
-                    HeadTeacher: data.HeadTeacherNum || '',
-                    Name: data.Name,
-                    ClassInfoId: data.ClassInfoId,
-                };
-            })
-                .catch((err) => {
-                    this.$message({
-                        message: '详情获取失败！',
-                        type: 'error'
-                    });
-                });
-        },
-        submitForm(formName) {
-            //班级提交
-            this.$refs[formName].validate((valid) => {
-                if (valid) {
-                    // debugger
-                    //let content = this.phoneEditor.txt.html();//htm标签加文字
-                    // let content = this.phoneEditor.txt.text();//文字
-                    let datas = {
-                        classinfoName: this.formItem.Name,
-                        MajorId: this.formItem.selectId,
-                        ClassinfoGrade: this.formItem.ClassinfoGrade,
-                        CounselorNum: this.formItem.Counselor,
-                        HeadTeacherNum: this.formItem.HeadTeacher,
-
-                    };
-                    postClassInfoAddinfo(datas).then((res) => {
-                        let data = res;
-                        if (data == 1) {
-                            this.$message({
-                                message: '新增成功',
-                                type: 'success'
-                            });
-                            this.drawerform1 = false;
-                            if (this.queryParams.type == 0) {
-                                this.getclassinfoDatainfo(this.pageobj.pageNum);//获取班级
-
-                            } else {
-                                this.getCourseinfoDatainfo(this.pageobj.pageNum);//获取课程
-                            }
-                        } else if (data == 2) {
-                            this.$message({
-                                message: '班级名称不可为空',
-                                type: 'error'
-                            });
-                        } else if (data == 3) {
-                            this.$message({
-                                message: '专业不正确',
-                                type: 'error'
-                            });
-                        } else if (data == 4) {
-                            this.$message({
-                                message: '不可以添加其他学校的班级',
-                                type: 'error'
-                            });
-                        } else if (data == 5) {
-                            this.$message({
-                                message: '该用户不存在',
-                                type: 'error'
-                            });
-                        } else if (data == 6) {
-                            this.$message({
-                                message: '没有添加班级的权限',
-                                type: 'error'
-                            });
-                        } else if (data == 7) {
-                            this.$message({
-                                message: '不可添加别的学校的班级',
-                                type: 'error'
-                            });
-                        } else if (data == 8) {
-                            this.$message({
-                                message: '新增班级名已存在',
-                                type: 'error'
-                            });
-                        } else if (data == 9) {
-                            this.$message({
-                                message: '输入的班主任工号不正确',
-                                type: 'error'
-                            });
-                        } else if (data == 10) {
-                            this.$message({
-                                message: '输入的辅导员工号不正确',
-                                type: 'error'
-                            });
-                        } else {
-                            this.$message({
-                                message: '新增失败',
-                                type: 'error'
-                            });
-                        }
-
-
-
-                    })
-                        .catch((err) => {
-                            // console.log(err);
-                        });
-                } else {
-                    // console.log('error submit!!');
-                    return false;
-                }
-            });
-        },
-
-        editsubmitForm(formName) {
-            //修改提交
-
-            this.$refs[formName].validate((valid) => {
-                if (valid) {
-                    // debugger
-                    // let content = this.phoneEditor.txt.text();//文字
-                    let datas = {
-                        ClassinfoId: this.formItem.ClassInfoId,
-                        Name: this.formItem.Name,
-                        MajorId: this.formItem.selectId,
-                        Grade: this.formItem.ClassinfoGrade,
-                        CounselorNum: this.formItem.Counselor,
-                        HeadTeacherNum: this.formItem.HeadTeacher,
-
-                    };
-                    postClassInfoeditinfo(datas).then((res) => {
-                        let data = res;
-                        // debugger
-                        if (data == 1) {
-                            //   debugger
-                            this.$message({
-                                message: '修改成功',
-                                type: 'success'
-                            });
-                            this.drawerform1 = false;
-                            //debugger
-                            if (this.queryParams.type == 0) {
-                                this.getclassinfoDatainfo(this.pageobj.pageNum);//获取班级
-
-                            } else {
-                                this.getCourseinfoDatainfo(this.pageobj.pageNum);//获取课程
-                            }
-                        } else if (data == 2) {
-                            this.$message({
-                                message: '班级名称不可为空',
-                                type: 'error'
-                            });
-                        } else if (data == 3) {
-                            this.$message({
-                                message: '专业不正确',
-                                type: 'error'
-                            });
-                        } else if (data == 4) {
-                            this.$message({
-                                message: '不可以修改其他学校的班级',
-                                type: 'error'
-                            });
-                        } else if (data == 5) {
-                            this.$message({
-                                message: '该用户不存在',
-                                type: 'error'
-                            });
-                        } else if (data == 6) {
-                            this.$message({
-                                message: '没有修改班级的权限',
-                                type: 'error'
-                            });
-                        } else if (data == 7) {
-                            this.$message({
-                                message: '所修改的班级选择的专业不是该用户所属学校的（不可修改别的学校的班级）',
-                                type: 'error'
-                            });
-                        } else if (data == 8) {
-                            this.$message({
-                                message: '修改后的班级名已存在',
-                                type: 'error'
-                            });
-                        } else if (data == 9) {
-                            this.$message({
-                                message: '班级ID错误',
-                                type: 'error'
-                            });
-                        } else {
-                            this.$message({
-                                message: '修改失败',
-                                type: 'error'
-                            });
-                        }
-
-                    })
-                        .catch((err) => {
-                            // console.log(err);
-                        });
-
-                } else {
-                    // console.log('error submit!!');
-                    return false;
-                }
-            });
-        },
-        // 课程
-
-        getcuinfodetail(obj, id) {
-            //获取编辑信息
-            getCourseInfodetail({ gcid: id }).then((res) => {
-                debugger
-
-                let data = res;
-                if (data) {
-                    this.formItem1 = {
-                        collegeId: data.CollegeId,
-                        selectId: data.MajorId,
-                        LessonsNum: data.LessonsNum,
-                        Name: data.Name,
-                        Type: data.Type,
-                        Grade: data.Grade,
-                        Description: data.Description,
-                        CourseId: data.CourseId
-                    };
-                } else {
-                    this.formItem1 = {
-                        collegeId: Number(this.collegeId),
-                        selectId: Number(this.mtid),
-                        LessonsNum: obj.LessonsNum,
-                        Name: obj.Name,
-                        Type: obj.Type,
-                        Grade: obj.Grade,
-                        Description: obj.Description,
-                        CourseId: obj.CourseId
-                    };
-                }
-
-
-                setTimeout(() => {
-                    this.setcreate();//创建夫文本编辑框
-                    this.phoneEditor.txt.text(this.formItem1.Description);
-                }, 200);
-
-            })
-                .catch((err) => {
-                    this.$message({
-                        message: '详情获取失败！',
-                        type: 'error'
-                    });
-                });
-        },
-        submitForm2(formName) {
-            //班级提交
-            this.$refs[formName].validate((valid) => {
-                if (valid) {
-                    // debugger
-                    //let content = this.phoneEditor.txt.html();//htm标签加文字
-                    let content = this.phoneEditor.txt.text();//文字
-                    let datas = {
-                        LessonsNum: this.formItem1.LessonsNum,
-                        MajorId: this.formItem1.selectId,
-                        Name: this.formItem1.Name,
-                        // Type: encodeURI(this.formItem1.Type).replace(/\+/g, "%2B"),
-                        Type: this.formItem1.Type,
-                        Grade: this.formItem1.Grade,
-                        // Description: this.formItem1.Description
-                        Description: content
-
-                    };
-                    postCourseInfoAddinfo(datas).then((res) => {
-                        let data = res;
-                        if (data == 1) {
-                            this.$message({
-                                message: '新增成功',
-                                type: 'success'
-                            });
-                            this.drawerform2 = false;
-                            if (this.queryParams.type == 0) {
-                                this.getclassinfoDatainfo(this.pageobj.pageNum);//获取班级
-
-                            } else {
-                                this.getCourseinfoDatainfo(this.pageobj.pageNum);//获取课程
-                            }
-                        } else if (data == 2) {
-                            this.$message({
-                                message: '课程名称不可空',
-                                type: 'error'
-                            });
-                        } else if (data == 3) {
-                            this.$message({
-                                message: '该专业下存在此课程',
-                                type: 'error'
-                            });
-                        } else if (data == 4) {
-                            this.$message({
-                                message: '课程类型不能为空',
-                                type: 'error'
-                            });
-                        } else {
-                            this.$message({
-                                message: '新增失败',
-                                type: 'error'
-                            });
-                        }
-
-
-
-                    })
-                        .catch((err) => {
-                            // console.log(err);
-                        });
-                } else {
-                    // console.log('error submit!!');
-                    return false;
-                }
-            });
-        },
-
-        editsubmitForm2(formName) {
-            //修改提交
-            //  debugger
-            this.$refs[formName].validate((valid) => {
-                if (valid) {
-                    // debugger
-                    let content = this.phoneEditor.txt.text();//文字
-                    let datas = {
-                        CourseId: this.formItem1.CourseId,
-                        LessonsNum: this.formItem1.LessonsNum,
-                        MajorId: this.formItem1.selectId,
-                        Name: this.formItem1.Name,
-                        Type: this.formItem1.Type,
-                        Grade: this.formItem1.Grade,
-                        Description: content
-                        //  Description: this.formItem1.Description
-
-
-                    };
-                    postCourseInfoeditinfo(datas).then((res) => {
-                        let data = res;
-                        // debugger
-                        if (data == 1) {
-                            //   debugger
-                            this.$message({
-                                message: '修改成功',
-                                type: 'success'
-                            });
-                            this.drawerform2 = false;
-                            //debugger
-                            if (this.queryParams.type == 0) {
-                                this.getclassinfoDatainfo(this.pageobj.pageNum);//获取班级
-
-                            } else {
-                                this.getCourseinfoDatainfo(this.pageobj.pageNum);//获取课程
-                            }
-                        } else if (data == 2) {
-                            this.$message({
-                                message: '课程名称不可空',
-                                type: 'error'
-                            });
-                        } else if (data == 3) {
-                            this.$message({
-                                message: '该专业下存在此课程',
-                                type: 'error'
-                            });
-                        } else if (data == 4) {
-                            this.$message({
-                                message: '课程类型不能为空',
-                                type: 'error'
-                            });
-                        } else {
-                            this.$message({
-                                message: '修改失败',
-                                type: 'error'
-                            });
-                        }
-
-                    })
-                        .catch((err) => {
-                            // console.log(err);
-                        });
-
-                } else {
-                    // debugger
-                    // console.log('error submit!!');
-                    return false;
-                }
-            });
-        },
-        delclassitem(info) {
-            // debugger
-            //删除班级数据
-            delClassinfo({ id: info.ClassInfoId, }).then((res) => {
-                let data = res;
-                if (data == 1) {
-                    this.$message({
-                        message: '删除成功',
-                        type: 'success'
-                    });
-                    this.getclassinfoDatainfo(this.pageobj.pageNum);
-                } else {
-                    this.$message({
-                        message: '删除失败',
-                        type: 'error'
-                    });
-                }
-
-            }).catch((err) => {
-                // console.log(err);
-            });
-        },
-        delCourseitem(info) {
-            // debugger
-            //删除课程数据
-            delCourseinfo({ dcid: info.CourseId, }).then((res) => {
-                let data = res;
-                if (data == 1) {
-                    this.$message({
-                        message: '删除成功',
-                        type: 'success'
-                    });
-                    this.getCourseinfoDatainfo(this.pageobj.pageNum);
-                } else {
-                    this.$message({
-                        message: '删除失败',
-                        type: 'error'
-                    });
-                }
-
-            }).catch((err) => {
-                // console.log(err);
-            });
-        },
-
-        // 已完成 数据备份table中的信息
-        getclassinfoDatainfo(pageNum) {
-            //  debugger
-            this.pageobj.pageNum = pageNum;
-            getclassinfoData({
-                oldTotal: this.pageobj.oldTotal,
-                oldCurrent: this.pageobj.oldCurrent,
-                pageSize: this.pageobj.pageSize,
-                pageNum: pageNum,
-                classname: this.queryParams.clname,
-                majorname: this.mtname,
-
-            }).then((res) => {
-                let data = res;
-                if (data.length > 0) {
-                    this.pageobj.Total = data[0].total;
-                } else {
-                    this.pageobj.Total = 0;
-                    this.pageobj.pageNum = 1;
-                }
-                this.tableData = data;
-
-            })
-                .catch((err) => {
-                    // console.log(err);
-                    this.$message({
-                        message: '列表信息获取失败',
-                        type: 'error'
-                    });
-                });
-        },
-        // 已完成 数据恢复table中的信息
-        getCourseinfoDatainfo(pageNum) {
-            //  debugger  
-            this.pageobj.pageNum = pageNum;
-            getCourseinfoData({
-                oldTotal: this.pageobj.oldTotal,
-                oldCurrent: this.pageobj.oldCurrent,
-                pageSize: this.pageobj.pageSize,
-                pageNum: pageNum,
-                coursename: this.queryParams.coursename,
-                majorname: this.mtname,
-
-            }).then((res) => {
-                let data = res;
-                if (data.length > 0) {
-                    this.pageobj.Total = data[0].total;
-                } else {
-                    this.pageobj.Total = 0;
-                    this.pageobj.pageNum = 1;
-                }
-                this.tableData = data;
-
-            })
-                .catch((err) => {
-                    // console.log(err);
-                    this.$message({
-                        message: '列表信息获取失败',
-                        type: 'error'
-                    });
-                });
-        },
-
-
-    },
-    // 
-
-    mounted() {
-
-        //   this.setDefaultTime();//初始化时间
-        // this.gettableinfo(1);
-
-        let routeParams = this.$route.query;
-        if (routeParams) {
-            this.mtname = routeParams.majorName;
-            this.mtid = routeParams.majorId;
-            this.collegeId = routeParams.collegeId;
-            this.collegeNam = routeParams.collegeNam;
-        }
-        this.getclassinfoDatainfo(1);//获取班级
-
-    },
-    activated() {
-    },
-    created() {
-    },
-};
-</script>
\ No newline at end of file
diff --git a/src/views/collage-information/collage-information.vue b/src/views/collage-information/collage-information.vue
index dea1c07..a8cbfad 100644
--- a/src/views/collage-information/collage-information.vue
+++ b/src/views/collage-information/collage-information.vue
@@ -1,252 +1,315 @@
 <style lang="scss" scoped>
 @import "../table.scss";
 </style>
-
 <template>
     <div>
         <el-card>
-            <div class="seachbox">
-                <!--prefix-icon="el-icon-user",表示加一个搜素图标,设置在头-->
-                <!--suffix-icon="el-icon-tickets"",表示加一个搜素图标,设置在尾-->
-                <el-select v-model="queryParams.collegename" placeholder="学院列表" filterable clearable size="small"
-                    class="ml-5 seachbox_input">
-                    <el-option v-for="item in collegeList" placeholder="学院" :key="item.name" :label="item.name"
-                        :value="item.name" />
-                </el-select>
-                <el-button class="ml-5" type="primary" @click="getCollegedatainfo(1)">搜索</el-button>
-            </div>
             <!--两个div层之间都用margin，则会自动隔开-->
-            <div class="seachbox">
-                <el-button type="success" @click="addbox" class="seachboxadd">
-                    <el-icon class="el-icon-left">
-                        <Plus :size="30" />
-                    </el-icon>
-                    <div> 新 增 </div>
-                </el-button>
-                <!-- <el-button type="danger">批量删除 <i class="el-icon-remove-outline"></i></el-button> -->
-                <!-- <el-button type="primary">导入 <i class="el-icon-bottom"></i></el-button>
-                                            <el-button type="primary">导出 <i class="el-icon-top"></i></el-button> -->
-            </div>
-            <!--border stripe,表示加上斑马线-->
-            <!--header-row-class-name="headerBg",表示设置表头颜色样式，headerBg为一个style样式类-->
-            <el-table :data="tableData" border stripe :header-cell-style="{ 'text-align': 'center' }"
-                :scrollbar-always-on="true">
-                <!-- <el-table-column type="selection" width="55" align="center" /> -->
-                <el-table-column prop="Name" align="center" label="学院名称" width="300">
-                </el-table-column>
-                <el-table-column prop="SchoolName" label="学校" align="center" width="120">
-                </el-table-column>
-                <el-table-column prop="ShortName" align="center" label="简称">
-                </el-table-column>
-                <el-table-column prop="Type" align="center" label="类型">
-                </el-table-column>
-                <el-table-column prop="DisplayOrder" align="center" label="排序号">
-                </el-table-column>
-                <el-table-column prop="Description" label="学院描述" width="300">
-                </el-table-column>
-                <el-table-column label="操作" align="center" width="150" fixed="right">
-                    <template #default="scope">
-                        <el-row class="rowcenter">
-                            <Edit-Button permission="CollegeColumns:Edit" content="编辑"
-                                @clicknative="edititem(scope.row)"></Edit-Button>
-                            <Details-Button permission="CollegeColumns:Details"
-                                @clicknative="detailTableItem(scope.row)" content="学院专业详情"></Details-Button>
-                            <Delete-Button permission="CollegeColumns:Delete" @confirm="delitem(scope.row)"
-                                content="删除"></Delete-Button>
 
-                            <Operate-Button permission="CollegeColumns:Operate" @clicknative="setitem(scope.row)"
-                                content="学院设置"></Operate-Button>
+            <el-tabs type="border-card" v-model="queryParams.type" @tab-change="clickTabsitem">
+                <el-tab-pane label="班级" :name="0">
+                    <div class="seachbox">
+                        <el-button type="success" @click="addbox1" class="seachboxadd">
+                            <el-icon class="el-icon-left">
+                                <Plus :size="30" />
+                            </el-icon>
+                            <div> 新增班级 </div>
+                        </el-button>
+                    </div>
+                    <div class="seachbox">
 
-                            <!-- <el-button type="success" plain @click="edititem(scope.row)">编辑 <i class="el-icon-edit"></i>
-                            </el-button>
-                            <el-button type="danger" plain @click="delitem(scope.row)">删除 <i
-                                    class="el-icon-remove-outline"></i></el-button>
-                            <el-button type="info" plain>详情 <i class="el-icon-document"></i></el-button>
-                                                            <el-button type="warning" plain @click="setitem(scope.row)">设置 <i
-                                                                    class="el-icon-setting"></i></el-button> -->
-                        </el-row>
-                    </template>
-                </el-table-column>
-            </el-table>
+                        <el-input class="ml-5 seachbox_input" v-model.trim="queryParams.clname" placeholder="请输入班级名称"
+                            clearable size="small" />
+                        <el-button type="primary" @click="getclassinfoDatainfo(pageobj.pageNum)" class="seachboxadd">
+                            搜索
+                        </el-button>
 
+                    </div>
+                    <el-table :data="tableData" border stripe :header-cell-style="{ 'text-align': 'center' }"
+                        :scrollbar-always-on="true">
+                        <!-- <el-table-column type="selection" width="55" align="center" /> -->
+                        <el-table-column prop="Name" label="班级名称" align="center">
+                        </el-table-column>
+                        <el-table-column prop="HeadTeacherNum" label="教师" align="center">
+                        </el-table-column>
+                        <el-table-column prop="TrainingStartTime" align="center" label="培训开始时间">
+                        </el-table-column>
+                        <el-table-column prop="TrainingEndTime" align="center" label="培训结束时间">
+                        </el-table-column>
+                        <!-- <el-table-column prop="Grade" align="center" label="类型">
+                        </el-table-column>
+                        <el-table-column prop="Grade" align="center" label="单位">
+                        </el-table-column> -->
+                        <el-table-column prop="ClassRemark" align="center" label="备注">
+                        </el-table-column>
+                        <el-table-column label="操作" align="center" width="150" fixed="right">
+                            <template #default="scope">
+                                <el-row class="rowcenter">
+                                    <Edit-Button permission="ClassesColumns:Edit" content="编辑"
+                                        @clicknative="editclassitem(scope.row)"></Edit-Button>
+                                    <Delete-Button permission="ClassesColumns:Delete" @confirm="delclassitem(scope.row)"
+                                        content="删除"></Delete-Button>
+                                </el-row>
+                            </template>
+                        </el-table-column>
 
-            <div class="paginationbox">
-                <!--内边距空一些-->
-                <el-pagination background @size-change="handleSizeChange" @current-change="handleCurrentChange"
-                    :current-page="pageobj.pageNum" :page-sizes="pageobj.pageSizeOptions" :page-size="pageobj.pageSize"
-                    layout="total, sizes, prev, pager, next" :total="pageobj.Total">
-                </el-pagination>
-
-                <!--1.page-sizes一般设置为5，10，15，20-->
-                <!--1.page-size一般设置为10，即每页10个-->
-            </div>
+                    </el-table>
+                    <div class="paginationbox">
+                        <!--内边距空一些-->
+                        <!-- 搞定 -->
+                        <el-pagination background @size-change="handleSizeChange" @current-change="handleCurrentChange"
+                            :current-page="pageobj.pageNum" :page-sizes="pageobj.pageSizeOptions"
+                            :page-size="pageobj.pageSize" layout="total, sizes, prev, pager, next"
+                            :total="pageobj.Total">
+                        </el-pagination>
+                    </div>
+                </el-tab-pane>
+                <!-- <el-tab-pane label="课程" :name="1">
+                    <div class="seachbox">
+                        <el-button type="success" @click="addbox2" class="seachboxadd">
+                            <el-icon class="el-icon-left">
+                                <Plus :size="30" />
+                            </el-icon>
+                            <div> 新增课程 </div>
+                        </el-button>
+                    </div>
+                    <div class="seachbox" style="display: flex;">
+                        <el-input class="ml-5 seachbox_input" v-model.trim="queryParams.coursename"
+                            placeholder="请输入课程级名称" clearable size="small" />
+                        <el-button class="ml-5" type="primary" style="margin-left: 10px;"
+                            @click="getCourseinfoDatainfo(pageobj.pageNum)">搜索</el-button>
+                    </div>
+                    <el-table :data="tableData" border stripe :header-cell-style="{ 'text-align': 'center' }">
+                        <el-table-column prop="Name" align="center" label="课程名称">
+                        </el-table-column>
+                        <el-table-column prop="Code" align="center" label="课程编号">
+                        </el-table-column>
+                        <el-table-column prop="Type" align="center" label="课程类型">
+                        </el-table-column>
+                        <el-table-column prop="Grade" align="center" label="学分">
+                        </el-table-column>
+                        <el-table-column prop="MajorName" align="center" label="专业名称">
+                        </el-table-column>
+                        <el-table-column prop="Description" align="center" label="课程简介">
+                        </el-table-column>
+                        <el-table-column label="操作" align="center" width="150" fixed="right">
+                            <template #default="scope">
+                                <el-row class="rowcenter">
+                                    <Edit-Button permission="CourseColumns:Edit" content="编辑"
+                                        @clicknative="editCourseitem(scope.row)"></Edit-Button>
+                                    <Delete-Button permission="CourseColumns:Delete" @confirm="delCourseitem(scope.row)"
+                                        content="删除"></Delete-Button>
+                                </el-row>
+                            </template>
+                        </el-table-column>
+                    </el-table>
+                    <div class="paginationbox">
+                        <el-pagination background @size-change="handleSizeChange" @current-change="handleCurrentChange"
+                            :current-page="pageobj.pageNum" :page-sizes="pageobj.pageSizeOptions"
+                            :page-size="pageobj.pageSize" layout="total, sizes, prev, pager, next"
+                            :total="pageobj.Total">
+                        </el-pagination>
+                    </div>
+                </el-tab-pane> -->
+            </el-tabs>
         </el-card>
-        <el-drawer v-model="drawerform" :title="drawerformtitle" :append-to-body="false">
-            <!-- 新增修改左侧框 -->
+
+        <el-drawer v-model="drawerform1" :title="drawerformtitle1" :append-to-body="false">
+            <!-- 新增修改班级左侧框 -->
             <div class="demo-drawer__content">
                 <el-form label-position="right" ref="ruleForm" :rules="rules" label-width="100px" :model="formItem">
-                    <el-form-item label="学院名称" prop="Name">
-                        <el-input v-model.trim="formItem.Name" placeholder="请输入学院名称" autocomplete="off"></el-input>
-                    </el-form-item>
-                    <el-form-item label="简称" prop="abbreviation">
-                        <el-input v-model.trim="formItem.abbreviation" placeholder="请输入简称"
-                            autocomplete="off"></el-input>
-                    </el-form-item>
-                    <el-form-item label="类型" prop="classify">
-                        <el-select v-model="formItem.classify" placeholder="请选择类型" style="width:100%">
-                            <el-option v-for="item in classifyList" :key="item.value" :label="item.name"
-                                :value="item.value">{{
-                                    item.name
-                                }}</el-option>
+                    <!-- <el-form-item label="学院名称" prop="collegeId">
+                        <el-select v-model="formItem.collegeId" filterable placeholder="请选择学院" @change="classmajorList"
+                            :disabled="formItem.collegeId ? true : false">
+                            <el-option v-for="item in collegeList" :key="item.value" :label="item.name"
+                                :value="item.value"></el-option>
                         </el-select>
                     </el-form-item>
-                    <el-form-item label="排序号" prop="queNum">
-                        <el-input placeholder="请输入排序号" v-model.trim="formItem.queNum" autocomplete="off"></el-input>
+                    <el-form-item label="专业名称" prop="collegeId">
+                        <el-select v-model="formItem.selectId" filterable placeholder="请选择专业"
+                            :disabled="formItem.selectId ? true : false">
+                            <el-option v-for="item in majorList" :key="item.value" :label="item.name"
+                                :value="item.value"></el-option>
+                        </el-select>
+                    </el-form-item> -->
+                    <el-form-item label="班级名称" prop="Name">
+                        <el-input v-model.trim="formItem.Name" placeholder="请输入班级名称" autocomplete="off"></el-input>
                     </el-form-item>
-                    <el-form-item label="学院代码" prop="Code">
-                        <el-input placeholder="请输入学院代码" v-model.trim="formItem.Code" autocomplete="off"></el-input>
+                    <!-- <el-form-item label="年级" prop="ClassinfoGrade">
+                        <el-input v-model.trim="formItem.ClassinfoGrade" placeholder="请输入年级"
+                            autocomplete="off"></el-input>
+                    </el-form-item> -->
+                    <!-- <el-form-item label="培训形式" prop="ClassinfoGrade">
+                        <el-input v-model.trim="formItem.ClassinfoGrade" placeholder="新增-线下班、融合班"
+                            autocomplete="off"></el-input>
                     </el-form-item>
-                    <el-form-item label="学院描述" prop="Description">
-                        <!-- <el-input v-model="formItem.Description" placeholder="请输入学院描述信息" autocomplete="off"></el-input>
-                                                     -->
-                        <div ref="editor" id="websiteEditorElem" style="height:300px;background-color: #fff;"></div>
-
-
-
+                    <el-form-item label="学期类型" prop="ClassinfoGrade">
+                        <el-input v-model.trim="formItem.ClassinfoGrade" placeholder="新增-春季、秋季"
+                            autocomplete="off"></el-input>
+                    </el-form-item> -->
+                    <!-- <el-form-item label="单位" prop="Counselor">
+                        <el-input v-model.trim="formItem.Counselor" placeholder="新增-单位"
+                            autocomplete="off"></el-input>
+                    </el-form-item> -->
+                    <el-form-item label="培训开始时间" prop="ClassRemark">
+                        <el-date-picker
+                            v-model="formItem.TrainingStartTime"
+                            type="date"
+                            placeholder="请选择培训开始时间"
+                            value-format="YYYY-MM-DD"
+                        />
+                    </el-form-item>
+                    <el-form-item label="培训结束时间" prop="ClassRemark">
+                        <el-date-picker
+                            v-model="formItem.TrainingEndTime"
+                            type="date"
+                            placeholder="请选择培训结束时间"
+                            value-format="YYYY-MM-DD"
+                        />
+                    </el-form-item>
+                    <el-form-item label="老师（校内）" prop="ClassRemark">
+                        <el-input v-model="formItem.TeacherName" readonly placeholder="请选择教师" @click="modelteacher"
+                            autocomplete="off"></el-input>
+                    </el-form-item>
+                    <el-form-item label="备注" prop="ClassRemark">
+                        <el-input v-model.trim="formItem.ClassRemark" placeholder="新增-请输入班主任工号"
+                            autocomplete="off"></el-input>
                     </el-form-item>
                 </el-form>
-
-                <div class="demo-drawer__footer" v-if="!isedit">
+                <div class="demo-drawer__footer" v-if="!isedit1">
                     <el-button type="primary" @click="submitForm('ruleForm')">提交</el-button>
                     <el-button @click="resetForm('ruleForm')">重置</el-button>
                 </div>
-                <div class="demo-drawer__footer" v-if="isedit">
+                <div class="demo-drawer__footer" v-if="isedit1">
                     <el-button type="primary" @click="editsubmitForm('ruleForm')">提交</el-button>
                     <el-button @click="editresetForm('ruleForm')">重置</el-button>
                 </div>
 
             </div>
         </el-drawer>
-        <!-- 使用指令控制拖拽 -->
 
 
-        <el-dialog :title="collegename" v-model="setdialogDrag" width="30%" center>
-            <div class="dialogcenter">
+        <el-drawer v-model="drawerform2" :title="drawerformtitle2" :append-to-body="false">
+            <!-- 新增修改课程左侧框 -->
+            <div class="demo-drawer__content">
+                <el-form label-position="right" ref="ruleForm2" :rules="rules2" label-width="100px" :model="formItem1">
+                    <el-form-item label="学院名称" prop="collegeId">
+                        <el-select v-model="formItem1.collegeId" filterable placeholder="请选择学院" @change="classmajorList"
+                            :disabled="formItem1.collegeId ? true : false">
+                            <el-option v-for="item in collegeList" :key="item.value" :label="item.name"
+                                :value="item.value"></el-option>
+                        </el-select>
+                    </el-form-item>
+                    <el-form-item label="专业名称" prop="collegeId">
+                        <el-select v-model="formItem1.selectId" filterable placeholder="请选择专业"
+                            :disabled="formItem1.selectId ? true : false">
+                            <el-option v-for="item in majorList" :key="item.value" :label="item.name"
+                                :value="item.value"></el-option>
+                        </el-select>
+                    </el-form-item>
+                    <el-form-item label="课程名称" prop="Name">
+                        <el-input v-model.trim="formItem1.Name" placeholder="请输入课程名称" autocomplete="off"></el-input>
+                    </el-form-item>
+                    <el-form-item label="课程类型" prop="Type">
+                        <el-input v-model.trim="formItem1.Type" placeholder="请输入课程类型" autocomplete="off"></el-input>
+                    </el-form-item>
+                    <el-form-item label="课程编号" prop="LessonsNum">
+                        <el-input-number v-model="formItem1.LessonsNum" :min="0" :max="100000"
+                            label="请输入课程编号"></el-input-number>
+                    </el-form-item>
+                    <el-form-item label="学分" prop="Grade">
+                        <el-input-number v-model="formItem1.Grade" :min="0" :max="100000"
+                            label="请输入学分"></el-input-number>
+                    </el-form-item>
+                    <el-form-item label="课程简介" prop="Description">
 
-                <div class="dialogcenter_div">教师是否显示考勤 <el-radio-group style="margin-left:15px;" v-model="whetherAtt">
-                        <el-radio label="1">是</el-radio>
-                        <el-radio label="0">否</el-radio>
-                    </el-radio-group>
+                        <div ref="editor" id="websiteEditorElem" style="height:300px;background-color: #fff;"></div>
+                    </el-form-item>
+                </el-form>
+                <div class="demo-drawer__footer" v-if="!isedit2">
+                    <el-button type="primary" @click="submitForm2('ruleForm2')">提交</el-button>
+                    <el-button @click="resetForm2('ruleForm2')">重置</el-button>
                 </div>
-                <div class="dialogcenter_div">考勤是否回写CRP <el-radio-group style="margin-left:15px;"
-                        v-model="whetherRewrite">
-                        <el-radio label="1">是</el-radio>
-                        <el-radio label="0">否</el-radio>
-                    </el-radio-group>
+                <div class="demo-drawer__footer" v-if="isedit2">
+                    <el-button type="primary" @click="editsubmitForm2('ruleForm2')">提交</el-button>
+                    <el-button @click="editresetForm2('ruleForm2')">重置</el-button>
                 </div>
 
             </div>
-            <div class="dialog-footer footercenter">
-                <el-button @click="setdialogDrag = false">取 消</el-button>
-                <el-button type="primary" @click="saveFun">确 定</el-button>
-            </div>
+        </el-drawer>
+
+        <el-dialog title="选择教师" v-model="teachershow" center draggable>
+            <teacher-select @funval="numberval" :showteacherselect="showteacherselect"
+                :activwshow="activwshow"></teacher-select>
         </el-dialog>
-
     </div>
 </template>
 
 <script>
-import { getCollegedata, getCollegeselect, postcollege, editpostcollege, getdetail, delcollege, postsaveFun, getTeaWhetherId } from "@/api/collegeinformation.js";
-
-import E from 'wangeditor'
-
+// 引入组件
+import E from 'wangeditor';
+import { getDefaultTime } from "@/utils/common.js"
+import teacherSelect from "@/components/teacherselect.vue";
+import { getclassinfoData, getCourseinfoData, delClassinfo, delCourseinfo, getStudentlevel, postClassInfoAddinfo, postClassInfoeditinfo, getClassInfodetail, postCourseInfoAddinfo, postCourseInfoeditinfo, getCourseInfodetail } from "@/api/collegeinformation.js";
 export default {
-    name: "collegeinformation",
+    name: "classandcourse",
     components: {
-
+        teacherSelect
+        // "year-range": YearRangePicker,
     },
     directives: {
 
     },
     data() {
         return {
+            activwshow: 0,
+            teachershow: false,
+            showteacherselect: false,
             phoneEditor: null,
-            setdialogDrag: false,
-            collegename: "",
-            TeaWhetherId: 0,
-            collegenameid: 0,
-            whetherAtt: '1',
-            whetherRewrite: '0',
-            classifyList: [
-                {
-                    value: 1,
-                    name: "党政管理部门",
-                },
-                {
-                    value: 2,
-                    name: "教学单位",
-                },
-                {
-                    value: 3,
-                    name: "教辅单位",
-                },
-                {
-                    value: 4,
-                    name: "科研单位",
-                },
-                {
-                    value: 5,
-                    name: "群团组织",
-                },
-                {
-                    value: 9,
-                    name: "校外单位",
-                },
-            ],
-            drawerformtitle: '',
-            formItem: {
-                id: '',
-                selectId: 1,
-                Description: "",
-                Name: "",
-                // WhetherAttStr: 1,
-                abbreviation: "",
-                classify: "",
-                queNum: "",
-                Code: "",
-                refName: "createCollege",
-            },
-            isedit: false,
-            // 查询参数
+            mtname: "",
+            mtid: "",
+            collegeId: '',
+            collegeNam: '',
+
             queryParams: {
-
-                collegename: '',
-                schoolId: 0,
+                clname: '',
+                coursename: '',
+                type: 0,
             },
-            rules: {
-                Name: [
-                    { required: true, message: '请输入学院名称', trigger: 'blur' },
-                    //{ min: 3, max: 5, message: '长度在 3 到 5 个字符', trigger: 'blur' }
-                ],
-                abbreviation: [
-                    { required: true, message: '请输入学院简称', trigger: 'blur' },
-                ],
-                classify: [
-                    { type: 'date', required: true, message: '请选择类型', trigger: 'change' }
-                ],
-
-                queNum: [
-                    { required: true, message: '请输入排序号', trigger: 'blur' }
-                ],
-
-                Code: [
-                    { required: true, message: '请输入学院代码', trigger: 'blur' }
-                ],
-
+            formItem: {
+                MajorId:1,
+                TrainingStartTime:'',
+                TrainingEndTime:'',
+                collegeId: "",
+                selectId: "",
+                ClassinfoGrade: "",
+                Counselor: "",
+                ClassRemark: "",
+                Name: "",
+                ClassInfoId: '',
+                Type: '',
+            },
+
+            formItem1: {
+                collegeId: "",
+                selectId: "",
+                LessonsNum: 0,
+                Name: "",
+                Type: "",
+                Grade: 0,
+                Description: "",
+                CourseId: ''
             },
-            tableData: [],
             collegeList: [],
-            drawerform: false,
+            majorList: [],
+            tableData: [],
+            isedit1: false,
+            drawerform1: false,
+            drawerformtitle: "",
+            drawerformtitle1: '',
+            isedit2: false,
+            drawerform2: false,
+            drawerformtitle2: '',
             pageobj: {
                 oldTotal: 0,
                 oldCurrent: 1,
@@ -254,7 +317,44 @@ export default {
                 pageSize: 10,
                 pageNum: 1,
                 pageSizeOptions: [10, 20, 50, 100, 150, 200],
-            }
+                majorName:'培训班'
+            },
+            rules: {
+                Name: [
+                    { required: true, message: '请输入班级名称', trigger: 'blur' },
+                    //{ min: 3, max: 5, message: '长度在 3 到 5 个字符', trigger: 'blur' }
+                ],
+                collegeId: [
+                    { required: true, message: '请选择学院', trigger: 'blur' },
+                    //{ min: 3, max: 5, message: '长度在 3 到 5 个字符', trigger: 'blur' }
+                ],
+                selectId: [
+                    { required: true, message: '请选择专业', trigger: 'blur' },
+                    //{ min: 3, max: 5, message: '长度在 3 到 5 个字符', trigger: 'blur' }
+                ],
+            },
+            rules2: {
+                Name: [
+                    { required: true, message: '请输入课程名称', trigger: 'blur' },
+                    //{ min: 3, max: 5, message: '长度在 3 到 5 个字符', trigger: 'blur' }
+                ],
+                collegeId: [
+                    { required: true, message: '请选择学院', trigger: 'blur' },
+                    //{ min: 3, max: 5, message: '长度在 3 到 5 个字符', trigger: 'blur' }
+                ],
+                selectId: [
+                    { required: true, message: '请选择专业', trigger: 'blur' },
+                    //{ min: 3, max: 5, message: '长度在 3 到 5 个字符', trigger: 'blur' }
+                ],
+
+                Type: [
+                    {
+                        required: true, message: '请输入课程类型', trigger: 'blur'
+                    },
+                    //{ min: 3, max: 5, message: '长度在 3 到 5 个字符', trigger: 'blur' }
+                ],
+
+            },
         };
     },
     computed: {
@@ -262,43 +362,145 @@ export default {
 
     },
     methods: {
+        modelteacher() {
+            this.activwshow = 1;
+            this.teachershow = true;
+            this.showteacherselect = true;
+        },
+        numberval(data) {
+            // 传值赋值
+            // debugger;
+            this.formItem.TeacherName = data.Name;//教师
+            this.formItem.TeacherNumber = data.Number;//教师工号
+            this.teachershow = false;
+        },
+        classmajorList() {
+            this.getlevemajorList(this.formItem.collegeId, "c");
+        },
+        clickTabsitem(e) {
+            // 点击切换标签
+            //  debugger
+            this.pageobj.pageNum = 1;
+            this.pageobj.pageSize = 10;
+            if (this.queryParams.type == 0) {
+                this.getclassinfoDatainfo(1);//获取班级
+
+            } else {
+                this.getCourseinfoDatainfo(1);//获取课程
+            }
+
+        },
         handleCurrentChange(e) {
             //切换页码
             // debugger
             this.pageobj.pageNum = Math.ceil(e);
-            this.getCollegedatainfo(this.pageobj.pageNum);
+            if (this.queryParams.type == 0) {
+                this.getclassinfoDatainfo(this.pageobj.pageNum);//获取班级
+
+            } else {
+                this.getCourseinfoDatainfo(this.pageobj.pageNum);//获取课程
+            }
         },
         handleSizeChange(e) {
             //切换每页显示数
             this.pageobj.pageSize = Math.ceil(e);
             this.pageobj.pageNum = 1
-            this.getCollegedatainfo(this.pageobj.pageNum);
+
+            if (this.queryParams.type == 0) {
+                this.getclassinfoDatainfo(this.pageobj.pageNum);//获取班级
+
+            } else {
+                this.getCourseinfoDatainfo(this.pageobj.pageNum);//获取课程
+            }
+        },
+        getlevecolegelist() {
+            //获取学院
+            getStudentlevel({ SelectCollegeList: '', isAll: false })
+                .then((res) => {
+                    this.collegeList = res;
+                    this.getlevemajorList(this.formItem.collegeId, "c");
+                })
+        },
+        getlevemajorList(id, s, isAll = false) {
+            //获取专业
+            getStudentlevel({
+                CollegeId: id,
+                Signal: s,
+                isAll: isAll,
+            })
+                .then((res) => {
+                    this.majorList = res;
+                })
+        },
+        resetForm(formName) {
+            //新增重置
+
+            this.$refs[formName].resetFields();
+            this.formItem.collegeId = Number(this.collegeId);
+            this.formItem.selectId = Number(this.mtid);
+        },
+        editresetForm(formName) {
+
+
+            this.getclinfodetail(this.formItem.ClassInfoId);
+        },
+
+        resetForm2(formName) {
+            //新增重置
+
+            this.$refs[formName].resetFields();
+            this.formItem.collegeId = Number(this.collegeId);
+            this.formItem.selectId = Number(this.mtid);
+        },
+        editresetForm2(formName) {
+
+            this.getcuinfodetail(this.formItem1, this.formItem1.CourseId);
 
         },
-        detailTableItem(row) {
-            let argu = {
-                Name: row.Name,
-                CollegeId: row.CollegeId,
-            };
-            this.$router.push({
-                name: "collegedetails",
-                query: argu,
-
-            });
-        },
-        addbox() {
-            // debugger
-            //新增信息
-            this.isedit = false;
-            this.drawerform = true
+        addbox1() {
+            //新增班级信息
+            this.isedit1 = false;
+            this.drawerform1 = true;
+            //获取
             setTimeout(() => {
+                // debugger
                 this.$data.formItem = JSON.parse(JSON.stringify(this.$options.data().formItem));
                 this.$refs['ruleForm'].resetFields();
-                this.drawerformtitle = '新增学院信息';
-                this.setcreate();//创建夫文本编辑框
+                this.drawerformtitle1 = '新增班级信息';
+                this.formItem.collegeId = Number(this.collegeId);
+                this.formItem.selectId = Number(this.mtid);
+                this.getlevecolegelist();//获取学院                        
+
+                //this.setcreate();//创建夫文本编辑框
             }, 200);
         },
+        editclassitem(info) {
+            //获取修改详情
+            debugger
+            this.isedit1 = true;
+            this.drawerform1 = true;
+            this.getlevecolegelist();//获取学院      
+            this.getclinfodetail(info.ClassInfoId,info.HeadTeacherNum);
+            this.drawerformtitle1 = '编辑班级信息';
 
+            
+        },
+        addbox2() {
+            //新增课程信息
+            this.isedit2 = false;
+            this.drawerform2 = true;
+            //获取
+            setTimeout(() => {
+                // debugger
+                this.$refs['ruleForm2'].resetFields();
+                this.drawerformtitle2 = '新增课程信息';
+                this.formItem1.collegeId = Number(this.collegeId);
+                this.formItem1.selectId = Number(this.mtid);
+                this.getlevecolegelist();//获取学院                        
+                this.setcreate();//创建夫文本编辑框
+                //this.setcreate();//创建夫文本编辑框
+            }, 200);
+        },
         setcreate() {
             // this.closedrawer();
             //创建夫文本编辑框
@@ -329,137 +531,487 @@ export default {
                 // this.phoneEditor.txt.text('')
                 this.phoneEditor.txt.clear();
             }
+            //编辑里面赋值还没写好
+
 
 
         },
-        closedrawer() {
+        editCourseitem(info) {
+            //获取修改详情
+            //debugger
+
+            this.drawerform2 = true;
+            this.isedit2 = true;
+            this.getlevecolegelist();//获取学院      
+            this.getcuinfodetail(info, info.CourseId);
+            this.drawerformtitle2 = '编辑课程信息';
+        },
+        getclinfodetail(id,HeadTeacherNum) {
+            //获取编辑信息
+            getClassInfodetail({ gcid: id }).then((res) => {
+                
+                debugger
+                let data = res;
+                this.formItem = {
+                    collegeId: data.CollegeId,
+                    selectId: data.MajorId,
+                    ClassinfoGrade: data.Grade || '',
+                    Counselor: data.CounselorNum || '',
+                    ClassRemark: data.HeadTeacherNum || '',
+                    Name: data.Name,
+                    ClassInfoId: data.ClassInfoId,
+                    TrainingStartTime:data.TrainingStartTime,
+                    TrainingEndTime:data.TrainingEndTime,
+                    TeacherName:HeadTeacherNum,
+                    HeadTeacherNum:data.HeadTeacherNum
+                };
+                
+            })
+                .catch((err) => {
+                    this.$message({
+                        message: '详情获取失败！',
+                        type: 'error'
+                    });
+                });
+        },
+        submitForm(formName) {
+            //班级提交
+            this.$refs[formName].validate((valid) => {
+                if (valid) {
+                    // debugger
+                    //let content = this.phoneEditor.txt.html();//htm标签加文字
+                    // let content = this.phoneEditor.txt.text();//文字
+                    let datas = {
+                        classinfoName: this.formItem.Name,
+                        CounselorNum: '',
+                        collegeId:1,
+                        TrainingStartTime: this.formItem.TrainingStartTime,
+                        TrainingEndTime: this.formItem.TrainingEndTime,
+                        MajorId: 1,
+                        TeacherName:this.formItem.TeacherName,
+                        ClassRemark:this.formItem.ClassRemark,
+                        ClassinfoGrade: '',//this.formItem.ClassinfoGrade
+                        HeadTeacherNum: this.formItem.TeacherNumber
+                    };
+
+                    postClassInfoAddinfo(datas).then((res) => {
+                        let data = res;
+                        if (data == 1) {
+                            this.$message({
+                                message: '新增成功',
+                                type: 'success'
+                            });
+                            this.drawerform1 = false;
+                            if (this.queryParams.type == 0) {
+                                this.getclassinfoDatainfo(this.pageobj.pageNum);//获取班级
+
+                            } else {
+                                this.getCourseinfoDatainfo(this.pageobj.pageNum);//获取课程
+                            }
+                        } else if (data == 2) {
+                            this.$message({
+                                message: '班级名称不可为空',
+                                type: 'error'
+                            });
+                        } else if (data == 3) {
+                            this.$message({
+                                message: '专业不正确',
+                                type: 'error'
+                            });
+                        } else if (data == 4) {
+                            this.$message({
+                                message: '不可以添加其他学校的班级',
+                                type: 'error'
+                            });
+                        } else if (data == 5) {
+                            this.$message({
+                                message: '该用户不存在',
+                                type: 'error'
+                            });
+                        } else if (data == 6) {
+                            this.$message({
+                                message: '没有添加班级的权限',
+                                type: 'error'
+                            });
+                        } else if (data == 7) {
+                            this.$message({
+                                message: '不可添加别的学校的班级',
+                                type: 'error'
+                            });
+                        } else if (data == 8) {
+                            this.$message({
+                                message: '新增班级名已存在',
+                                type: 'error'
+                            });
+                        } else if (data == 9) {
+                            this.$message({
+                                message: '输入的班主任工号不正确',
+                                type: 'error'
+                            });
+                        } else if (data == 10) {
+                            this.$message({
+                                message: '输入的辅导员工号不正确',
+                                type: 'error'
+                            });
+                        } else {
+                            this.$message({
+                                message: '新增失败',
+                                type: 'error'
+                            });
+                        }
+
+
+
+                    })
+                        .catch((err) => {
+                            // console.log(err);
+                        });
+                } else {
+                    // console.log('error submit!!');
+                    return false;
+                }
+            });
+        },
+
+        editsubmitForm(formName) {
+            //修改提交
+            this.$refs[formName].validate((valid) => {
+                if (valid) {
+                    // let content = this.phoneEditor.txt.text();//文字
+                    let datas = {
+                        ClassinfoId: this.formItem.ClassInfoId,
+                        Name: this.formItem.Name,
+                        HeadTeacherNum: this.formItem.HeadTeacherNum,
+
+                        TrainingStartTime: this.formItem.TrainingStartTime,
+                        TrainingEndTime: this.formItem.TrainingEndTime,
+                        TeacherName:this.formItem.TeacherName,
+                        ClassRemark:this.formItem.ClassRemark,
+
+                        ClassinfoGrade: '',
+                        collegeId:1,
+                        MajorId: 1,
+                        Grade: '',
+                        CounselorNum: '',
+                    };
+
+                    console.log(datas);
+                    
+                    postClassInfoeditinfo(datas).then((res) => {
+                        let data = res;
+                        // debugger
+                        if (data == 1) {
+                            //   debugger
+                            this.$message({
+                                message: '修改成功',
+                                type: 'success'
+                            });
+                            this.drawerform1 = false;
+                            //debugger
+                            if (this.queryParams.type == 0) {
+                                this.getclassinfoDatainfo(this.pageobj.pageNum);//获取班级
+
+                            } else {
+                                this.getCourseinfoDatainfo(this.pageobj.pageNum);//获取课程
+                            }
+                        } else if (data == 2) {
+                            this.$message({
+                                message: '班级名称不可为空',
+                                type: 'error'
+                            });
+                        } else if (data == 3) {
+                            this.$message({
+                                message: '专业不正确',
+                                type: 'error'
+                            });
+                        } else if (data == 4) {
+                            this.$message({
+                                message: '不可以修改其他学校的班级',
+                                type: 'error'
+                            });
+                        } else if (data == 5) {
+                            this.$message({
+                                message: '该用户不存在',
+                                type: 'error'
+                            });
+                        } else if (data == 6) {
+                            this.$message({
+                                message: '没有修改班级的权限',
+                                type: 'error'
+                            });
+                        } else if (data == 7) {
+                            this.$message({
+                                message: '所修改的班级选择的专业不是该用户所属学校的（不可修改别的学校的班级）',
+                                type: 'error'
+                            });
+                        } else if (data == 8) {
+                            this.$message({
+                                message: '修改后的班级名已存在',
+                                type: 'error'
+                            });
+                        } else if (data == 9) {
+                            this.$message({
+                                message: '班级ID错误',
+                                type: 'error'
+                            });
+                        } else {
+                            this.$message({
+                                message: '修改失败',
+                                type: 'error'
+                            });
+                        }
+
+                    })
+                        .catch((err) => {
+                            // console.log(err);
+                        });
+
+                } else {
+                    // console.log('error submit!!');
+                    return false;
+                }
+            });
+        },
+        // 课程
+
+        getcuinfodetail(obj, id) {
+            //获取编辑信息
+            getCourseInfodetail({ gcid: id }).then((res) => {
+                debugger
+
+                let data = res;
+                if (data) {
+                    this.formItem1 = {
+                        collegeId: data.CollegeId,
+                        selectId: data.MajorId,
+                        LessonsNum: data.LessonsNum,
+                        Name: data.Name,
+                        Type: data.Type,
+                        Grade: data.Grade,
+                        Description: data.Description,
+                        CourseId: data.CourseId
+                    };
+                } else {
+                    this.formItem1 = {
+                        collegeId: Number(this.collegeId),
+                        selectId: Number(this.mtid),
+                        LessonsNum: obj.LessonsNum,
+                        Name: obj.Name,
+                        Type: obj.Type,
+                        Grade: obj.Grade,
+                        Description: obj.Description,
+                        CourseId: obj.CourseId
+                    };
+                }
+
+
+                setTimeout(() => {
+                    this.setcreate();//创建夫文本编辑框
+                    this.phoneEditor.txt.text(this.formItem1.Description);
+                }, 200);
+
+            })
+                .catch((err) => {
+                    this.$message({
+                        message: '详情获取失败！',
+                        type: 'error'
+                    });
+                });
+        },
+        submitForm2(formName) {
+            //班级提交
+            this.$refs[formName].validate((valid) => {
+                if (valid) {
+                    // debugger
+                    //let content = this.phoneEditor.txt.html();//htm标签加文字
+                    let content = this.phoneEditor.txt.text();//文字
+                    let datas = {
+                        LessonsNum: this.formItem1.LessonsNum,
+                        MajorId: this.formItem1.selectId,
+                        Name: this.formItem1.Name,
+                        // Type: encodeURI(this.formItem1.Type).replace(/\+/g, "%2B"),
+                        Type: this.formItem1.Type,
+                        Grade: this.formItem1.Grade,
+                        // Description: this.formItem1.Description
+                        Description: content
+
+                    };
+                    postCourseInfoAddinfo(datas).then((res) => {
+                        let data = res;
+                        if (data == 1) {
+                            this.$message({
+                                message: '新增成功',
+                                type: 'success'
+                            });
+                            this.drawerform2 = false;
+                            if (this.queryParams.type == 0) {
+                                this.getclassinfoDatainfo(this.pageobj.pageNum);//获取班级
+
+                            } else {
+                                this.getCourseinfoDatainfo(this.pageobj.pageNum);//获取课程
+                            }
+                        } else if (data == 2) {
+                            this.$message({
+                                message: '课程名称不可空',
+                                type: 'error'
+                            });
+                        } else if (data == 3) {
+                            this.$message({
+                                message: '该专业下存在此课程',
+                                type: 'error'
+                            });
+                        } else if (data == 4) {
+                            this.$message({
+                                message: '课程类型不能为空',
+                                type: 'error'
+                            });
+                        } else {
+                            this.$message({
+                                message: '新增失败',
+                                type: 'error'
+                            });
+                        }
+
+
+
+                    })
+                        .catch((err) => {
+                            // console.log(err);
+                        });
+                } else {
+                    // console.log('error submit!!');
+                    return false;
+                }
+            });
+        },
+
+        editsubmitForm2(formName) {
+            //修改提交
+            //  debugger
+            this.$refs[formName].validate((valid) => {
+                if (valid) {
+                    // debugger
+                    let content = this.phoneEditor.txt.text();//文字
+                    let datas = {
+                        CourseId: this.formItem1.CourseId,
+                        LessonsNum: this.formItem1.LessonsNum,
+                        MajorId: this.formItem1.selectId,
+                        Name: this.formItem1.Name,
+                        Type: this.formItem1.Type,
+                        Grade: this.formItem1.Grade,
+                        Description: content
+                        //  Description: this.formItem1.Description
+
+
+                    };
+                    postCourseInfoeditinfo(datas).then((res) => {
+                        let data = res;
+                        // debugger
+                        if (data == 1) {
+                            //   debugger
+                            this.$message({
+                                message: '修改成功',
+                                type: 'success'
+                            });
+                            this.drawerform2 = false;
+                            //debugger
+                            if (this.queryParams.type == 0) {
+                                this.getclassinfoDatainfo(this.pageobj.pageNum);//获取班级
+
+                            } else {
+                                this.getCourseinfoDatainfo(this.pageobj.pageNum);//获取课程
+                            }
+                        } else if (data == 2) {
+                            this.$message({
+                                message: '课程名称不可空',
+                                type: 'error'
+                            });
+                        } else if (data == 3) {
+                            this.$message({
+                                message: '该专业下存在此课程',
+                                type: 'error'
+                            });
+                        } else if (data == 4) {
+                            this.$message({
+                                message: '课程类型不能为空',
+                                type: 'error'
+                            });
+                        } else {
+                            this.$message({
+                                message: '修改失败',
+                                type: 'error'
+                            });
+                        }
+
+                    })
+                        .catch((err) => {
+                            // console.log(err);
+                        });
+
+                } else {
+                    // debugger
+                    // console.log('error submit!!');
+                    return false;
+                }
+            });
+        },
+        delclassitem(info) {
             // debugger
-            //关闭抽屉时
-            this.phoneEditor.txt.text("");
-            this.phoneEditor.destroy();
-            this.phoneEditor = null;
-        },
-        setitem(info) {
-            //设置
-            this.collegenameid = info.CollegeId;
-            getTeaWhetherId({ collegeId: this.collegenameid, }).then((res) => {
-                let data = res;
-                if (data == null) {
-                    this.$message({
-                        message: '请求错误',
-                        type: 'error'
-                    });
-                } else {
-                    this.whetherRewrite = data.WhetherRewrite == 1 ? "1" : "0";
-                    this.whetherAtt = data.WhetherAtt == 1 ? "1" : "0";
-                    this.TeaWhetherId = data.TeaWhetherAttId;
-                    this.setdialogDrag = true;
-                    this.collegename = data.CollegeName;
-                }
-            })
-                .catch((error) => {
-                    this.$message({
-                        message: '请求错误',
-                        type: 'error'
-                    });
-                    return;
-                });
-        },
-        saveFun(info) {
-            //设置提交
-
-            postsaveFun({ id: this.TeaWhetherId, WhetherAtt: Number(this.whetherAtt), WhetherRewrite: Number(this.whetherRewrite), }).then((res) => {
-                let data = res;
-                if (data == 1) {
-                    this.setdialogDrag = false;
-                    this.$message({
-                        message: '保存成功',
-                        type: 'success'
-                    });
-                } else {
-                    this.setdialogDrag = false;
-                    this.$message({
-                        message: '保存出错',
-                        type: 'error'
-                    });
-                }
-            })
-                .catch((error) => {
-                    this.$Message.error("请求错误");
-                    return;
-                });
-
-        },
-        delitem(info) {
-            //删除数据
-
-            delcollege({ id: info.CollegeId, }).then((res) => {
+            //删除班级数据
+            delClassinfo({ id: info.ClassInfoId, }).then((res) => {
                 let data = res;
                 if (data == 1) {
                     this.$message({
                         message: '删除成功',
                         type: 'success'
                     });
-                    this.getCollegedatainfo(1);
-                } else if (data == 2) {
-                    this.$message({
-                        message: '删除失败，没有删除学院的权限',
-                        type: 'error'
-                    });
-                } else if (data == 3) {
-                    this.$message({
-                        message: "删除失败，删除的学院不是自己学校的学院，无权修改",
-                        type: 'error'
-                    });
-                } else if (data == 4) {
-                    this.$message({
-                        message: "删除失败，该用户不存在",
-                        type: 'error'
-                    });
+                    this.getclassinfoDatainfo(this.pageobj.pageNum);
                 } else {
                     this.$message({
-                        message: "删除失败",
+                        message: '删除失败',
                         type: 'error'
                     });
                 }
+
             }).catch((err) => {
                 // console.log(err);
             });
         },
-        edititem(info) {
-            //获取修改详情
-            //  debugger
-            this.isedit = true;
-            this.drawerform = true
-            getdetail({ gcid: info.CollegeId, }).then((res) => {
+        delCourseitem(info) {
+            // debugger
+            //删除课程数据
+            delCourseinfo({ dcid: info.CourseId, }).then((res) => {
                 let data = res;
-                this.formItem.id = info.CollegeId;
-                this.formItem.Name = data.Name;
-                this.formItem.Description = data.Description;
-                this.formItem.abbreviation = data.ShortName;
-                this.formItem.selectId = data.SchoolId;
-                this.formItem.classify = data.Type;
-                this.formItem.queNum = data.DisplayOrder;
-                this.formItem.Code = data.Code;
-                setTimeout(() => {
-                    this.drawerformtitle = '修改学院信息';
-                    this.setcreate();//创建夫文本编辑框
-                    this.phoneEditor.txt.text(data.Description);
-                }, 200);
-            })
-                .catch((err) => {
-                    // console.log(err);
-                });
+                if (data == 1) {
+                    this.$message({
+                        message: '删除成功',
+                        type: 'success'
+                    });
+                    this.getCourseinfoDatainfo(this.pageobj.pageNum);
+                } else {
+                    this.$message({
+                        message: '删除失败',
+                        type: 'error'
+                    });
+                }
+
+            }).catch((err) => {
+                // console.log(err);
+            });
         },
-        getCollegedatainfo(pageNum) {
-            //获取学院列表
-            getCollegedata({
+
+        // 已完成 数据备份table中的信息
+        getclassinfoDatainfo(pageNum) {
+            //  debugger
+            this.pageobj.pageNum = pageNum;
+            getclassinfoData({
                 oldTotal: this.pageobj.oldTotal,
                 oldCurrent: this.pageobj.oldCurrent,
                 pageSize: this.pageobj.pageSize,
                 pageNum: pageNum,
-                collegename: this.queryParams.collegename || '',
-                schoolid: '',
+                classname: this.queryParams.clname,
+                majorname: '培训班',
+
             }).then((res) => {
                 let data = res;
                 if (data.length > 0) {
@@ -469,201 +1021,66 @@ export default {
                     this.pageobj.pageNum = 1;
                 }
                 this.tableData = data;
+
             })
                 .catch((err) => {
                     // console.log(err);
+                    this.$message({
+                        message: '列表信息获取失败',
+                        type: 'error'
+                    });
                 });
         },
-        getCollegeselectinfo() {
-            //获取学院查询列表
-            getCollegeselect({ SelectCollegeList: '' }
-            ).then((res) => {
+        // 已完成 数据恢复table中的信息
+        getCourseinfoDatainfo(pageNum) {
+            //  debugger  
+            this.pageobj.pageNum = pageNum;
+            getCourseinfoData({
+                oldTotal: this.pageobj.oldTotal,
+                oldCurrent: this.pageobj.oldCurrent,
+                pageSize: this.pageobj.pageSize,
+                pageNum: pageNum,
+                coursename: this.queryParams.coursename,
+                majorname: this.mtname,
+
+            }).then((res) => {
                 let data = res;
-                this.collegeList = data;
+                if (data.length > 0) {
+                    this.pageobj.Total = data[0].total;
+                } else {
+                    this.pageobj.Total = 0;
+                    this.pageobj.pageNum = 1;
+                }
+                this.tableData = data;
+
             })
                 .catch((err) => {
                     // console.log(err);
+                    this.$message({
+                        message: '列表信息获取失败',
+                        type: 'error'
+                    });
                 });
         },
-        submitForm(formName) {
-            //新增提交
-            this.$refs[formName].validate((valid) => {
-                if (valid) {
-                    //  debugger
-                    //let content = this.phoneEditor.txt.html();//htm标签加文字
-                    let content = this.phoneEditor.txt.text();//文字
-                    let datas = {
-                        Name: this.formItem.Name,
-                        Description: content,
-                        SchoolId: this.formItem.selectId,
-                        ShortName: this.formItem.abbreviation,
-                        type: this.formItem.classify,
-                        DisplayOrder: this.formItem.queNum,
-                        code: this.formItem.Code,
-                    };
-                    postcollege(datas).then((res) => {
-                        let data = res;
-                        if (data == 1) {
-                            this.$message({
-                                message: '新增成功',
-                                type: 'success'
-                            });
-                            this.drawerform = false;
-                            this.getCollegedatainfo(this.pageobj.pageNum);
-                        } else if (data == 2) {
-                            this.$message({
-                                message: '学院名称不可为空',
-                                type: 'error'
-                            });
-                        } else if (data == 3) {
-                            this.$message({
-                                message: '学校不正确',
-                                type: 'error'
-                            });
-                        } else if (data == 4) {
-                            this.$message({
-                                message: '不可以添加其他学校的学院',
-                                type: 'error'
-                            });
-                        } else if (data == 5) {
-                            this.$message({
-                                message: '该用户不存在',
-                                type: 'error'
-                            });
-                        } else if (data == 6) {
-                            this.$message({
-                                message: '没有添加学院的权限',
-                                type: 'error'
-                            });
-                        } else if (data == 7) {
-                            this.$message({
-                                message: '学院已存在',
-                                type: 'error'
-                            });
-                        } else {
-                            this.$message({
-                                message: '新增失败',
-                                type: 'error'
-                            });
-                        }
-                    })
-                        .catch((err) => {
-                            // console.log(err);
-                        });
-                } else {
-                    // console.log('error submit!!');
-                    return false;
-                }
-            });
-        },
-        editsubmitForm(formName) {
-            //修改提交
-            this.$refs[formName].validate((valid) => {
-                if (valid) {
-                    // debugger
-                    let content = this.phoneEditor.txt.text();//文字
-                    if (content.length > 302) {
-                        this.$message({
-                            message: '描述不能超过300字符',
-                            type: 'error'
-                        });
 
-                        return false;
-                    }
 
-                    let datas = {
-                        Name: this.formItem.Name,
-                        Description: content,
-                        CollegeId: this.formItem.id,
-                        ShortName: this.formItem.abbreviation,
-                        type: this.formItem.classify,
-                        DisplayOrder: this.formItem.queNum,
-                        code: this.formItem.Code,
-                    };
-                    editpostcollege(datas).then((res) => {
-                        let data = res;
-                        if (data == 1) {
-                            this.$message({
-                                message: '修改成功',
-                                type: 'success'
-                            });
-                            this.drawerform = false;
-                            this.getCollegedatainfo(this.pageobj.pageNum);
-                        } else if (data == 2) {
-                            this.$message({
-                                message: '学院名称不可为空',
-                                type: 'error'
-                            });
-                        } else if (data == 3) {
-                            this.$message({
-                                message: '学校不正确',
-                                type: 'error'
-                            });
-                        } else if (data == 4) {
-                            this.$message({
-                                message: '不可以添加其他学校的学院',
-                                type: 'error'
-                            });
-                        } else if (data == 5) {
-                            this.$message({
-                                message: '该用户不存在',
-                                type: 'error'
-                            });
-                        } else if (data == 6) {
-                            this.$message({
-                                message: '修改后的学院名已存在',
-                                type: 'error'
-                            });
-                        } else if (data == 7) {
-                            this.$message({
-                                message: '学院已存在',
-                                type: 'error'
-                            });
-                        } else {
-                            this.$message({
-                                message: '修改失败',
-                                type: 'error'
-                            });
-                        }
-                    })
-                        .catch((err) => {
-                            // console.log(err);
-                        });
-                } else {
-                    // console.log('error submit!!');
-                    return false;
-                }
-            });
-        },
-        resetForm(formName) {
-            //新增重置
-            this.$refs[formName].resetFields();
-            this.setcreate();//创建夫文本编辑框
-
-        },
-        editresetForm(formName) {
-            //修改重置
-            // debugger
-            getdetail({ gcid: this.formItem.id, }).then((res) => {
-                let data = res;
-                this.formItem.id = this.formItem.id;
-                this.formItem.Name = data.Name;
-                this.formItem.Description = data.Description || '';
-                this.formItem.abbreviation = data.ShortName;
-                this.formItem.selectId = data.SchoolId;
-                this.formItem.classify = data.Type;
-                this.formItem.queNum = data.DisplayOrder;
-                this.formItem.Code = data.Code;
-                this.phoneEditor.txt.text(data.Description || '');
-            })
-                .catch((err) => {
-                    // console.log(err);
-                });
-        }
     },
+    // 
+
     mounted() {
-        this.getCollegeselectinfo();//获取学院查询列表
-        this.getCollegedatainfo(1);//获取学院列表
+
+        //   this.setDefaultTime();//初始化时间
+        // this.gettableinfo(1);
+
+        let routeParams = this.$route.query;
+        if (routeParams) {
+            this.mtname = routeParams.majorName;
+            this.mtid = routeParams.majorId;
+            this.collegeId = routeParams.collegeId;
+            this.collegeNam = routeParams.collegeNam;
+        }
+        this.getclassinfoDatainfo(1);//获取班级
+
     },
     activated() {
     },
diff --git a/src/views/collage-information/collage-information1.vue b/src/views/collage-information/collage-information1.vue
new file mode 100644
index 0000000..dea1c07
--- /dev/null
+++ b/src/views/collage-information/collage-information1.vue
@@ -0,0 +1,673 @@
+<style lang="scss" scoped>
+@import "../table.scss";
+</style>
+
+<template>
+    <div>
+        <el-card>
+            <div class="seachbox">
+                <!--prefix-icon="el-icon-user",表示加一个搜素图标,设置在头-->
+                <!--suffix-icon="el-icon-tickets"",表示加一个搜素图标,设置在尾-->
+                <el-select v-model="queryParams.collegename" placeholder="学院列表" filterable clearable size="small"
+                    class="ml-5 seachbox_input">
+                    <el-option v-for="item in collegeList" placeholder="学院" :key="item.name" :label="item.name"
+                        :value="item.name" />
+                </el-select>
+                <el-button class="ml-5" type="primary" @click="getCollegedatainfo(1)">搜索</el-button>
+            </div>
+            <!--两个div层之间都用margin，则会自动隔开-->
+            <div class="seachbox">
+                <el-button type="success" @click="addbox" class="seachboxadd">
+                    <el-icon class="el-icon-left">
+                        <Plus :size="30" />
+                    </el-icon>
+                    <div> 新 增 </div>
+                </el-button>
+                <!-- <el-button type="danger">批量删除 <i class="el-icon-remove-outline"></i></el-button> -->
+                <!-- <el-button type="primary">导入 <i class="el-icon-bottom"></i></el-button>
+                                            <el-button type="primary">导出 <i class="el-icon-top"></i></el-button> -->
+            </div>
+            <!--border stripe,表示加上斑马线-->
+            <!--header-row-class-name="headerBg",表示设置表头颜色样式，headerBg为一个style样式类-->
+            <el-table :data="tableData" border stripe :header-cell-style="{ 'text-align': 'center' }"
+                :scrollbar-always-on="true">
+                <!-- <el-table-column type="selection" width="55" align="center" /> -->
+                <el-table-column prop="Name" align="center" label="学院名称" width="300">
+                </el-table-column>
+                <el-table-column prop="SchoolName" label="学校" align="center" width="120">
+                </el-table-column>
+                <el-table-column prop="ShortName" align="center" label="简称">
+                </el-table-column>
+                <el-table-column prop="Type" align="center" label="类型">
+                </el-table-column>
+                <el-table-column prop="DisplayOrder" align="center" label="排序号">
+                </el-table-column>
+                <el-table-column prop="Description" label="学院描述" width="300">
+                </el-table-column>
+                <el-table-column label="操作" align="center" width="150" fixed="right">
+                    <template #default="scope">
+                        <el-row class="rowcenter">
+                            <Edit-Button permission="CollegeColumns:Edit" content="编辑"
+                                @clicknative="edititem(scope.row)"></Edit-Button>
+                            <Details-Button permission="CollegeColumns:Details"
+                                @clicknative="detailTableItem(scope.row)" content="学院专业详情"></Details-Button>
+                            <Delete-Button permission="CollegeColumns:Delete" @confirm="delitem(scope.row)"
+                                content="删除"></Delete-Button>
+
+                            <Operate-Button permission="CollegeColumns:Operate" @clicknative="setitem(scope.row)"
+                                content="学院设置"></Operate-Button>
+
+                            <!-- <el-button type="success" plain @click="edititem(scope.row)">编辑 <i class="el-icon-edit"></i>
+                            </el-button>
+                            <el-button type="danger" plain @click="delitem(scope.row)">删除 <i
+                                    class="el-icon-remove-outline"></i></el-button>
+                            <el-button type="info" plain>详情 <i class="el-icon-document"></i></el-button>
+                                                            <el-button type="warning" plain @click="setitem(scope.row)">设置 <i
+                                                                    class="el-icon-setting"></i></el-button> -->
+                        </el-row>
+                    </template>
+                </el-table-column>
+            </el-table>
+
+
+            <div class="paginationbox">
+                <!--内边距空一些-->
+                <el-pagination background @size-change="handleSizeChange" @current-change="handleCurrentChange"
+                    :current-page="pageobj.pageNum" :page-sizes="pageobj.pageSizeOptions" :page-size="pageobj.pageSize"
+                    layout="total, sizes, prev, pager, next" :total="pageobj.Total">
+                </el-pagination>
+
+                <!--1.page-sizes一般设置为5，10，15，20-->
+                <!--1.page-size一般设置为10，即每页10个-->
+            </div>
+        </el-card>
+        <el-drawer v-model="drawerform" :title="drawerformtitle" :append-to-body="false">
+            <!-- 新增修改左侧框 -->
+            <div class="demo-drawer__content">
+                <el-form label-position="right" ref="ruleForm" :rules="rules" label-width="100px" :model="formItem">
+                    <el-form-item label="学院名称" prop="Name">
+                        <el-input v-model.trim="formItem.Name" placeholder="请输入学院名称" autocomplete="off"></el-input>
+                    </el-form-item>
+                    <el-form-item label="简称" prop="abbreviation">
+                        <el-input v-model.trim="formItem.abbreviation" placeholder="请输入简称"
+                            autocomplete="off"></el-input>
+                    </el-form-item>
+                    <el-form-item label="类型" prop="classify">
+                        <el-select v-model="formItem.classify" placeholder="请选择类型" style="width:100%">
+                            <el-option v-for="item in classifyList" :key="item.value" :label="item.name"
+                                :value="item.value">{{
+                                    item.name
+                                }}</el-option>
+                        </el-select>
+                    </el-form-item>
+                    <el-form-item label="排序号" prop="queNum">
+                        <el-input placeholder="请输入排序号" v-model.trim="formItem.queNum" autocomplete="off"></el-input>
+                    </el-form-item>
+                    <el-form-item label="学院代码" prop="Code">
+                        <el-input placeholder="请输入学院代码" v-model.trim="formItem.Code" autocomplete="off"></el-input>
+                    </el-form-item>
+                    <el-form-item label="学院描述" prop="Description">
+                        <!-- <el-input v-model="formItem.Description" placeholder="请输入学院描述信息" autocomplete="off"></el-input>
+                                                     -->
+                        <div ref="editor" id="websiteEditorElem" style="height:300px;background-color: #fff;"></div>
+
+
+
+                    </el-form-item>
+                </el-form>
+
+                <div class="demo-drawer__footer" v-if="!isedit">
+                    <el-button type="primary" @click="submitForm('ruleForm')">提交</el-button>
+                    <el-button @click="resetForm('ruleForm')">重置</el-button>
+                </div>
+                <div class="demo-drawer__footer" v-if="isedit">
+                    <el-button type="primary" @click="editsubmitForm('ruleForm')">提交</el-button>
+                    <el-button @click="editresetForm('ruleForm')">重置</el-button>
+                </div>
+
+            </div>
+        </el-drawer>
+        <!-- 使用指令控制拖拽 -->
+
+
+        <el-dialog :title="collegename" v-model="setdialogDrag" width="30%" center>
+            <div class="dialogcenter">
+
+                <div class="dialogcenter_div">教师是否显示考勤 <el-radio-group style="margin-left:15px;" v-model="whetherAtt">
+                        <el-radio label="1">是</el-radio>
+                        <el-radio label="0">否</el-radio>
+                    </el-radio-group>
+                </div>
+                <div class="dialogcenter_div">考勤是否回写CRP <el-radio-group style="margin-left:15px;"
+                        v-model="whetherRewrite">
+                        <el-radio label="1">是</el-radio>
+                        <el-radio label="0">否</el-radio>
+                    </el-radio-group>
+                </div>
+
+            </div>
+            <div class="dialog-footer footercenter">
+                <el-button @click="setdialogDrag = false">取 消</el-button>
+                <el-button type="primary" @click="saveFun">确 定</el-button>
+            </div>
+        </el-dialog>
+
+    </div>
+</template>
+
+<script>
+import { getCollegedata, getCollegeselect, postcollege, editpostcollege, getdetail, delcollege, postsaveFun, getTeaWhetherId } from "@/api/collegeinformation.js";
+
+import E from 'wangeditor'
+
+export default {
+    name: "collegeinformation",
+    components: {
+
+    },
+    directives: {
+
+    },
+    data() {
+        return {
+            phoneEditor: null,
+            setdialogDrag: false,
+            collegename: "",
+            TeaWhetherId: 0,
+            collegenameid: 0,
+            whetherAtt: '1',
+            whetherRewrite: '0',
+            classifyList: [
+                {
+                    value: 1,
+                    name: "党政管理部门",
+                },
+                {
+                    value: 2,
+                    name: "教学单位",
+                },
+                {
+                    value: 3,
+                    name: "教辅单位",
+                },
+                {
+                    value: 4,
+                    name: "科研单位",
+                },
+                {
+                    value: 5,
+                    name: "群团组织",
+                },
+                {
+                    value: 9,
+                    name: "校外单位",
+                },
+            ],
+            drawerformtitle: '',
+            formItem: {
+                id: '',
+                selectId: 1,
+                Description: "",
+                Name: "",
+                // WhetherAttStr: 1,
+                abbreviation: "",
+                classify: "",
+                queNum: "",
+                Code: "",
+                refName: "createCollege",
+            },
+            isedit: false,
+            // 查询参数
+            queryParams: {
+
+                collegename: '',
+                schoolId: 0,
+            },
+            rules: {
+                Name: [
+                    { required: true, message: '请输入学院名称', trigger: 'blur' },
+                    //{ min: 3, max: 5, message: '长度在 3 到 5 个字符', trigger: 'blur' }
+                ],
+                abbreviation: [
+                    { required: true, message: '请输入学院简称', trigger: 'blur' },
+                ],
+                classify: [
+                    { type: 'date', required: true, message: '请选择类型', trigger: 'change' }
+                ],
+
+                queNum: [
+                    { required: true, message: '请输入排序号', trigger: 'blur' }
+                ],
+
+                Code: [
+                    { required: true, message: '请输入学院代码', trigger: 'blur' }
+                ],
+
+            },
+            tableData: [],
+            collegeList: [],
+            drawerform: false,
+            pageobj: {
+                oldTotal: 0,
+                oldCurrent: 1,
+                Total: 0,
+                pageSize: 10,
+                pageNum: 1,
+                pageSizeOptions: [10, 20, 50, 100, 150, 200],
+            }
+        };
+    },
+    computed: {
+        // 当前富文本实例
+
+    },
+    methods: {
+        handleCurrentChange(e) {
+            //切换页码
+            // debugger
+            this.pageobj.pageNum = Math.ceil(e);
+            this.getCollegedatainfo(this.pageobj.pageNum);
+        },
+        handleSizeChange(e) {
+            //切换每页显示数
+            this.pageobj.pageSize = Math.ceil(e);
+            this.pageobj.pageNum = 1
+            this.getCollegedatainfo(this.pageobj.pageNum);
+
+        },
+        detailTableItem(row) {
+            let argu = {
+                Name: row.Name,
+                CollegeId: row.CollegeId,
+            };
+            this.$router.push({
+                name: "collegedetails",
+                query: argu,
+
+            });
+        },
+        addbox() {
+            // debugger
+            //新增信息
+            this.isedit = false;
+            this.drawerform = true
+            setTimeout(() => {
+                this.$data.formItem = JSON.parse(JSON.stringify(this.$options.data().formItem));
+                this.$refs['ruleForm'].resetFields();
+                this.drawerformtitle = '新增学院信息';
+                this.setcreate();//创建夫文本编辑框
+            }, 200);
+        },
+
+        setcreate() {
+            // this.closedrawer();
+            //创建夫文本编辑框
+            // 绑定div上的IDwebsiteEditorElem
+            // editor.destroy()
+            //if ( this.phoneEditor == null) return
+            //  debugger
+            if (this.phoneEditor == null) {
+                // this.phoneEditor = new E('#websiteEditorElem')
+                this.phoneEditor = new E(this.$refs.editor)
+
+                // 获取输入的内容
+                this.phoneEditor.config.onchange = (html) => {
+                    // 打印输入的内容
+                    // console.log(html);
+                }
+                // 上传图片到服务器，base64形式
+                this.phoneEditor.config.uploadImgShowBase64 = true
+                // 隐藏网络图片
+                this.phoneEditor.config.showLinkImg = false
+                // 创建一个富文本编辑器
+                // this.phoneEditor.txt.text('');
+
+                this.phoneEditor.create()
+                this.phoneEditor.txt.clear();
+                // 富文本内容
+            } else {
+                // this.phoneEditor.txt.text('')
+                this.phoneEditor.txt.clear();
+            }
+
+
+        },
+        closedrawer() {
+            // debugger
+            //关闭抽屉时
+            this.phoneEditor.txt.text("");
+            this.phoneEditor.destroy();
+            this.phoneEditor = null;
+        },
+        setitem(info) {
+            //设置
+            this.collegenameid = info.CollegeId;
+            getTeaWhetherId({ collegeId: this.collegenameid, }).then((res) => {
+                let data = res;
+                if (data == null) {
+                    this.$message({
+                        message: '请求错误',
+                        type: 'error'
+                    });
+                } else {
+                    this.whetherRewrite = data.WhetherRewrite == 1 ? "1" : "0";
+                    this.whetherAtt = data.WhetherAtt == 1 ? "1" : "0";
+                    this.TeaWhetherId = data.TeaWhetherAttId;
+                    this.setdialogDrag = true;
+                    this.collegename = data.CollegeName;
+                }
+            })
+                .catch((error) => {
+                    this.$message({
+                        message: '请求错误',
+                        type: 'error'
+                    });
+                    return;
+                });
+        },
+        saveFun(info) {
+            //设置提交
+
+            postsaveFun({ id: this.TeaWhetherId, WhetherAtt: Number(this.whetherAtt), WhetherRewrite: Number(this.whetherRewrite), }).then((res) => {
+                let data = res;
+                if (data == 1) {
+                    this.setdialogDrag = false;
+                    this.$message({
+                        message: '保存成功',
+                        type: 'success'
+                    });
+                } else {
+                    this.setdialogDrag = false;
+                    this.$message({
+                        message: '保存出错',
+                        type: 'error'
+                    });
+                }
+            })
+                .catch((error) => {
+                    this.$Message.error("请求错误");
+                    return;
+                });
+
+        },
+        delitem(info) {
+            //删除数据
+
+            delcollege({ id: info.CollegeId, }).then((res) => {
+                let data = res;
+                if (data == 1) {
+                    this.$message({
+                        message: '删除成功',
+                        type: 'success'
+                    });
+                    this.getCollegedatainfo(1);
+                } else if (data == 2) {
+                    this.$message({
+                        message: '删除失败，没有删除学院的权限',
+                        type: 'error'
+                    });
+                } else if (data == 3) {
+                    this.$message({
+                        message: "删除失败，删除的学院不是自己学校的学院，无权修改",
+                        type: 'error'
+                    });
+                } else if (data == 4) {
+                    this.$message({
+                        message: "删除失败，该用户不存在",
+                        type: 'error'
+                    });
+                } else {
+                    this.$message({
+                        message: "删除失败",
+                        type: 'error'
+                    });
+                }
+            }).catch((err) => {
+                // console.log(err);
+            });
+        },
+        edititem(info) {
+            //获取修改详情
+            //  debugger
+            this.isedit = true;
+            this.drawerform = true
+            getdetail({ gcid: info.CollegeId, }).then((res) => {
+                let data = res;
+                this.formItem.id = info.CollegeId;
+                this.formItem.Name = data.Name;
+                this.formItem.Description = data.Description;
+                this.formItem.abbreviation = data.ShortName;
+                this.formItem.selectId = data.SchoolId;
+                this.formItem.classify = data.Type;
+                this.formItem.queNum = data.DisplayOrder;
+                this.formItem.Code = data.Code;
+                setTimeout(() => {
+                    this.drawerformtitle = '修改学院信息';
+                    this.setcreate();//创建夫文本编辑框
+                    this.phoneEditor.txt.text(data.Description);
+                }, 200);
+            })
+                .catch((err) => {
+                    // console.log(err);
+                });
+        },
+        getCollegedatainfo(pageNum) {
+            //获取学院列表
+            getCollegedata({
+                oldTotal: this.pageobj.oldTotal,
+                oldCurrent: this.pageobj.oldCurrent,
+                pageSize: this.pageobj.pageSize,
+                pageNum: pageNum,
+                collegename: this.queryParams.collegename || '',
+                schoolid: '',
+            }).then((res) => {
+                let data = res;
+                if (data.length > 0) {
+                    this.pageobj.Total = data[0].total;
+                } else {
+                    this.pageobj.Total = 0;
+                    this.pageobj.pageNum = 1;
+                }
+                this.tableData = data;
+            })
+                .catch((err) => {
+                    // console.log(err);
+                });
+        },
+        getCollegeselectinfo() {
+            //获取学院查询列表
+            getCollegeselect({ SelectCollegeList: '' }
+            ).then((res) => {
+                let data = res;
+                this.collegeList = data;
+            })
+                .catch((err) => {
+                    // console.log(err);
+                });
+        },
+        submitForm(formName) {
+            //新增提交
+            this.$refs[formName].validate((valid) => {
+                if (valid) {
+                    //  debugger
+                    //let content = this.phoneEditor.txt.html();//htm标签加文字
+                    let content = this.phoneEditor.txt.text();//文字
+                    let datas = {
+                        Name: this.formItem.Name,
+                        Description: content,
+                        SchoolId: this.formItem.selectId,
+                        ShortName: this.formItem.abbreviation,
+                        type: this.formItem.classify,
+                        DisplayOrder: this.formItem.queNum,
+                        code: this.formItem.Code,
+                    };
+                    postcollege(datas).then((res) => {
+                        let data = res;
+                        if (data == 1) {
+                            this.$message({
+                                message: '新增成功',
+                                type: 'success'
+                            });
+                            this.drawerform = false;
+                            this.getCollegedatainfo(this.pageobj.pageNum);
+                        } else if (data == 2) {
+                            this.$message({
+                                message: '学院名称不可为空',
+                                type: 'error'
+                            });
+                        } else if (data == 3) {
+                            this.$message({
+                                message: '学校不正确',
+                                type: 'error'
+                            });
+                        } else if (data == 4) {
+                            this.$message({
+                                message: '不可以添加其他学校的学院',
+                                type: 'error'
+                            });
+                        } else if (data == 5) {
+                            this.$message({
+                                message: '该用户不存在',
+                                type: 'error'
+                            });
+                        } else if (data == 6) {
+                            this.$message({
+                                message: '没有添加学院的权限',
+                                type: 'error'
+                            });
+                        } else if (data == 7) {
+                            this.$message({
+                                message: '学院已存在',
+                                type: 'error'
+                            });
+                        } else {
+                            this.$message({
+                                message: '新增失败',
+                                type: 'error'
+                            });
+                        }
+                    })
+                        .catch((err) => {
+                            // console.log(err);
+                        });
+                } else {
+                    // console.log('error submit!!');
+                    return false;
+                }
+            });
+        },
+        editsubmitForm(formName) {
+            //修改提交
+            this.$refs[formName].validate((valid) => {
+                if (valid) {
+                    // debugger
+                    let content = this.phoneEditor.txt.text();//文字
+                    if (content.length > 302) {
+                        this.$message({
+                            message: '描述不能超过300字符',
+                            type: 'error'
+                        });
+
+                        return false;
+                    }
+
+                    let datas = {
+                        Name: this.formItem.Name,
+                        Description: content,
+                        CollegeId: this.formItem.id,
+                        ShortName: this.formItem.abbreviation,
+                        type: this.formItem.classify,
+                        DisplayOrder: this.formItem.queNum,
+                        code: this.formItem.Code,
+                    };
+                    editpostcollege(datas).then((res) => {
+                        let data = res;
+                        if (data == 1) {
+                            this.$message({
+                                message: '修改成功',
+                                type: 'success'
+                            });
+                            this.drawerform = false;
+                            this.getCollegedatainfo(this.pageobj.pageNum);
+                        } else if (data == 2) {
+                            this.$message({
+                                message: '学院名称不可为空',
+                                type: 'error'
+                            });
+                        } else if (data == 3) {
+                            this.$message({
+                                message: '学校不正确',
+                                type: 'error'
+                            });
+                        } else if (data == 4) {
+                            this.$message({
+                                message: '不可以添加其他学校的学院',
+                                type: 'error'
+                            });
+                        } else if (data == 5) {
+                            this.$message({
+                                message: '该用户不存在',
+                                type: 'error'
+                            });
+                        } else if (data == 6) {
+                            this.$message({
+                                message: '修改后的学院名已存在',
+                                type: 'error'
+                            });
+                        } else if (data == 7) {
+                            this.$message({
+                                message: '学院已存在',
+                                type: 'error'
+                            });
+                        } else {
+                            this.$message({
+                                message: '修改失败',
+                                type: 'error'
+                            });
+                        }
+                    })
+                        .catch((err) => {
+                            // console.log(err);
+                        });
+                } else {
+                    // console.log('error submit!!');
+                    return false;
+                }
+            });
+        },
+        resetForm(formName) {
+            //新增重置
+            this.$refs[formName].resetFields();
+            this.setcreate();//创建夫文本编辑框
+
+        },
+        editresetForm(formName) {
+            //修改重置
+            // debugger
+            getdetail({ gcid: this.formItem.id, }).then((res) => {
+                let data = res;
+                this.formItem.id = this.formItem.id;
+                this.formItem.Name = data.Name;
+                this.formItem.Description = data.Description || '';
+                this.formItem.abbreviation = data.ShortName;
+                this.formItem.selectId = data.SchoolId;
+                this.formItem.classify = data.Type;
+                this.formItem.queNum = data.DisplayOrder;
+                this.formItem.Code = data.Code;
+                this.phoneEditor.txt.text(data.Description || '');
+            })
+                .catch((err) => {
+                    // console.log(err);
+                });
+        }
+    },
+    mounted() {
+        this.getCollegeselectinfo();//获取学院查询列表
+        this.getCollegedatainfo(1);//获取学院列表
+    },
+    activated() {
+    },
+    created() {
+    },
+};
+</script>
\ No newline at end of file
diff --git a/src/views/information_schedule/information_schedule.vue b/src/views/information_schedule/information_schedule.vue
index fe64c05..d09645e 100644
--- a/src/views/information_schedule/information_schedule.vue
+++ b/src/views/information_schedule/information_schedule.vue
@@ -33,7 +33,7 @@
                         <Upload :size="30" />
                     </el-icon>
                     <div> 导入考务信息</div>
-                </el-button>
+                </el-button> 
                 <!-- <el-button type="primary" @click="daortanshows">导入考务信息 <i class="el-icon-bottom"></i></el-button> -->
                 <!-- <el-button type="danger">批量删除 <i class="el-icon-remove-outline"></i></el-button> -->
                 <!-- <el-button type="primary">导入 <i class="el-icon-bottom"></i></el-button>
diff --git a/src/views/login/index.vue b/src/views/login/index.vue
index 04744af..5f34154 100644
--- a/src/views/login/index.vue
+++ b/src/views/login/index.vue
@@ -58,10 +58,10 @@ export default {
       leftuser,
       loginbg: loginbg,
       form: {
-        // username: "admin",
-        // password: "skzhsucceed",
-        username: "",
-        password: "",
+        username: "admin",
+        password: "skzhsucceed",
+        /* username: "",
+        password: "", */
       },
       pubKey: '',
       userinfodetails: {
diff --git a/src/views/student-information/student-information.vue b/src/views/student-information/student-information.vue
index e75e739..d83c899 100644
--- a/src/views/student-information/student-information.vue
+++ b/src/views/student-information/student-information.vue
@@ -11,16 +11,16 @@
 
 
 
-                <el-select v-model="queryParams.collegeId" placeholder="学院" size="small" @change="Changecollege"
+                <!-- <el-select v-model="queryParams.collegeId" placeholder="学院" size="small" @change="Changecollege"
                     filterable clearable class="ml-5 seachbox_input">
                     <el-option v-for="item in collegeList" :key="item.name" :label="item.name" :value="item.value" />
-                </el-select>
+                </el-select> -->
 
-                <el-select v-model="queryParams.majorId" placeholder="专业" filterable clearable @change="Changemajor"
+                <!-- <el-select v-model="queryParams.majorId" placeholder="专业" filterable clearable @change="Changemajor"
                     size="small" class="ml-5 seachbox_input">
 
                     <el-option v-for="item in majorList" :key="item.name" :label="item.name" :value="item.value" />
-                </el-select>
+                </el-select> -->
 
                 <el-select v-model="queryParams.classId" placeholder="班级" filterable clearable size="small"
                     class="ml-5 seachbox_input">
@@ -28,7 +28,7 @@
                 </el-select>
                 <el-input v-model.trim="queryParams.sname" placeholder="姓名" clearable class="ml-5 seachbox_input"
                     size="small" style="margin:0px 20px 0px 0px"></el-input>
-                <el-input v-model.trim="queryParams.num" placeholder="工/学号" class="ml-5 seachbox_input" size="small"
+                <el-input v-model.trim="queryParams.Phone" placeholder="电话" class="ml-5 seachbox_input" size="small"
                     style="margin:0px 20px 0px 0px" clearable></el-input>
                 <el-button class="ml-5" type="primary" @click="gettableinfo(1)">搜索</el-button>
             </div>
@@ -39,76 +39,23 @@
                     </el-icon>
                     <div> 新 增 </div>
                 </el-button>
-
+                <el-button type="primary" @click="daortanshows" class="seachboxadd">
+                    <el-icon class="el-icon-left">
+                        <Upload :size="30" />
+                    </el-icon>
+                    <div> 导入学生信息</div>
+                </el-button>
 
             </div>
             <el-table :data="tableData" border stripe :header-cell-style="{ 'text-align': 'center' }"
                 :scrollbar-always-on="true">
-                <el-table-column type="expand">
-                    <template #default="props">
-                        <div class="expandrowbox">
-                            <el-row class="expand-row">
-                                <el-col :span="6">
-                                    <span class="expand-key">学校: </span>
-                                    <span class="expand-value">{{ props.row.SchoolName }}</span>
-                                </el-col>
-                                <el-col :span="6">
-                                    <span class="expand-key">学制类型: </span>
-                                    <span class="expand-value">{{ props.row.EduSystem }}</span>
-                                </el-col>
-                                <el-col :span="6">
-                                    <span class="expand-key">入学时间: </span>
-                                    <span class="expand-value">{{ props.row.SStartTime }} </span>
-                                </el-col>
-                                <el-col :span="6">
-                                    <span class="expand-key">毕业时间: </span>
-                                    <span class="expand-value">{{ props.row.SEndTime }} </span>
-                                </el-col>
-                            </el-row>
-                            <el-row class="expand-row">
-                                <el-col :span="6">
-                                    <span class="expand-key">电话: </span>
-                                    <span class="expand-value">{{ props.row.Phone }}</span>
-                                </el-col>
-                                <el-col :span="6">
-                                    <span class="expand-key">微信: </span>
-                                    <span class="expand-value">{{ props.row.WeiXin }}</span>
-                                </el-col>
-                                <el-col :span="6">
-                                    <span class="expand-key">邮箱: </span>
-                                    <span class="expand-value">{{ props.row.Email }} </span>
-                                </el-col>
-                                <el-col :span="6">
-                                    <span class="expand-key">QQ: </span>
-                                    <span class="expand-value">{{ props.row.QQ }} </span>
-                                </el-col>
-                            </el-row>
-                            <el-row class="expand-row">
-                                <el-col :span="6">
-                                    <span class="expand-key">状态: </span>
-                                    <span class="expand-value">{{ props.row.Status == true ? '在校' : '毕业' }} </span>
-                                </el-col>
-                            </el-row>
-
-                        </div>
-                    </template>
-                </el-table-column>
                 <el-table-column prop="Name" align="center" label="姓名">
                 </el-table-column>
-                <el-table-column prop="Number" align="center" label="学号">
-                </el-table-column>
                 <el-table-column prop="ClassInfoName" align="center" label="班级">
                 </el-table-column>
-                <el-table-column prop="MajorName" align="center" label="专业">
+                <el-table-column prop="Phone" align="center" label="电话">
                 </el-table-column>
-                <el-table-column prop="CollegeName" align="center" label="学院">
-                </el-table-column>
-                <el-table-column prop="Type" align="center" label="是否考勤">
-                    <template v-slot="scope">
-                        <el-switch v-model="scope.row.Type" active-color="#13ce66" inactive-color="#ff4949"
-                            :active-value="1" :inactive-value="0" @change="onswitch(scope.row)">
-                        </el-switch>
-                    </template>
+                <el-table-column prop="Email" align="center" label="邮箱">
                 </el-table-column>
                 <el-table-column label="操作" align="center" width="150" fixed="right">
                     <template v-slot="scope">
@@ -133,7 +80,44 @@
             </div>
 
         </el-card>
+        <el-dialog title="导入学生信息" v-model="uploadkaowushow" draggable width="550px" center>
+            <div class="selectupbox">
+                <!-- <el-select v-model="classId" placeholder="请选择考试计划" :disabled="kshfile" filterable clearable
+                    class="ml-5 seachbox_input">
+                    <el-option v-for="item in planNamelist" :key="item.name" :label="item.name" :value="item.value" />
+                </el-select> -->
 
+                <el-select v-model="formItem.classId" placeholder="请选择班级" filterable clearable size="small"
+                            class="ml-5 seachbox_input">
+                            <el-option v-for="item in classList1" :key="item.name" :label="item.name"
+                                :value="item.value" />
+                        </el-select>
+                <div class="uploadanniubox">
+                    <el-button :icon="Search" type="success"
+                        @click.native="$refs.studentList.click()">导入考生信息</el-button>
+                </div>
+                <div class="xiazaiuploadbox">
+                    <a :href="urlStr1 + '/template/考生信息模板.xls'" style="color: #409EFF;display: block"
+                        download="filename">
+                        <p slot="title" style="margin: 16px">
+                            <Icon type="ios-download-outline"></Icon>
+                            点击这里下载考生信息模板文件
+                        </p>
+                    </a>
+                </div>
+            </div>
+            <form method="post" enctype="multipart/form-data" name="form1">
+                <input id="inputFile" type="file" ref="file" style="display: none" accept=".xls,.xlsx"
+                    @change="getFile($event)" />
+                <input id="inputStudent" type="file" ref="studentList" style="display: none" accept=".xls,.xlsx"
+                    @change="studentFile($event)" />
+            </form>
+
+            <div slot="footer" style="text-align:center ; margin-top: 20px;">
+                <el-button @click="uploadkaowushow = false">取 消</el-button>
+
+            </div>
+        </el-dialog>
         <el-drawer v-model="drawerform" :title="drawerformtitle" :append-to-body="false">
             <!-- 新增修改左侧框 -->
             <div class="demo-drawer__content">
@@ -142,20 +126,20 @@
                     <el-form-item label="姓名" prop="Name">
                         <el-input v-model.trim="formItem.Name" placeholder="请输入姓名" autocomplete="off"></el-input>
                     </el-form-item>
-                    <el-form-item label="学号" prop="Num">
+                    <!-- <el-form-item label="学号" prop="Num">
                         <el-input v-model.trim="formItem.Num" placeholder="请输入学号" maxlength="20"
                             autocomplete="off"></el-input>
-                    </el-form-item>
-                    <el-form-item label="学制" prop="EduSystem">
+                    </el-form-item> -->
+                    <!-- <el-form-item label="学制" prop="EduSystem">
                         <el-input v-model.trim="formItem.EduSystem" placeholder="请输入学制（例如：全日制）" maxlength="20"
                             autocomplete="off"></el-input>
                     </el-form-item>
                     <el-form-item label="学业期限" prop="date">
                         <el-date-picker v-model="formItem.date" value-format="YYYY-MM-DD" type="daterange"
                             placeholder="请选择学业期限" range-separator="至" start-placeholder="入学时间" end-placeholder="毕业时间" />
-                    </el-form-item>
+                    </el-form-item> -->
 
-                    <el-form-item label="学校" prop="schoolId">
+                    <!-- <el-form-item label="学校" prop="schoolId">
                         <el-select v-model="formItem.schoolId" disabled placeholder="请选择学校" filterable clearable
                             size="small" class="ml-5 seachbox_input">
                             <el-option v-for="item in schoolList" :key="item.name" :label="item.name"
@@ -175,7 +159,7 @@
                             <el-option v-for="item in majorList1" :key="item.name" :label="item.name"
                                 :value="item.value" />
                         </el-select>
-                    </el-form-item>
+                    </el-form-item> -->
                     <el-form-item label="班级" prop="classId">
                         <el-select v-model="formItem.classId" placeholder="请选择班级" filterable clearable size="small"
                             class="ml-5 seachbox_input">
@@ -187,15 +171,15 @@
                     <el-form-item label="电话" prop="Phone">
                         <el-input v-model.trim="formItem.Phone" placeholder="请输入电话" autocomplete="off"></el-input>
                     </el-form-item>
-                    <el-form-item label="QQ号" prop="QQ">
+                    <!-- <el-form-item label="QQ号" prop="QQ">
                         <el-input v-model.trim="formItem.QQ" placeholder="请输入QQ号" autocomplete="off"></el-input>
-                    </el-form-item>
+                    </el-form-item> -->
                     <el-form-item label="邮箱" prop="Email">
                         <el-input v-model.trim="formItem.Email" placeholder="请输入邮箱" autocomplete="off"></el-input>
                     </el-form-item>
-                    <el-form-item label="微信号" prop="WeiXin">
+                    <!-- <el-form-item label="微信号" prop="WeiXin">
                         <el-input v-model.trim="formItem.WeiXin" placeholder="请输入微信号" autocomplete="off"></el-input>
-                    </el-form-item>
+                    </el-form-item> -->
                 </el-form>
                 <div class="demo-drawer__footer" v-if="!isedit">
                     <el-button type="primary" @click="submitForm('ruleForm')">提交</el-button>
@@ -212,6 +196,7 @@
 </template>
 
 <script>
+import axios from "axios";
 import { getinfoData, getstudenlevel3, getschooList, deltableinfo, getdetail, setStudentType, posteditinfo, getschoolid } from "@/api/studentinformation.js";
 import E from 'wangeditor';
 export default {
@@ -299,11 +284,83 @@ export default {
                 ],
 
             },
-            drawerformtitle: ""
+            drawerformtitle: "",
+
+            uploadkaowushow: false,
+            classId: '',
+            kshfile: false,
         };
     },
 
     methods: {
+        daortanshows() {
+            //导入弹框打开
+            this.uploadkaowushow = true;
+            this.kshfile = false;
+            this.classId = '';
+
+            this.SelectClassList1('','s')
+        },
+        studentFile(event) {
+            //导入考生信息
+            // debugger;
+            let vm = this;
+            let file = event.target.files[0];
+            event.preventDefault();
+            let formData = new FormData();
+            formData.append("file", file);
+            let url = this.urlStr1 + '/api/ExamineeInfo/ImportExaminee?id=' + vm.classId;
+            const options = {
+                method: 'POST',
+                headers: {
+                    'content-type': 'application/x-www-form-urlencoded;charset=UTF-8',
+                    'Authorization': `bearer ${getToken('USER-TOKEN')}`
+
+                },
+                data: formData,
+                url,
+            }
+            axios(options).then((res) => {
+                let data = res.data;
+                if (data == 1) {
+                    this.$message({
+                        message: '导入成功',
+                        type: 'success'
+                    });
+                    this.uploadkaowushow = false;
+                    this.gettableinfo(this.pageobj.pageNum);
+                } else if (data == 2) {
+                    this.$message({
+                        message: '文件中没有数据',
+                        type: 'error'
+                    });
+
+                } else if (data == 3) {
+                    this.$message({
+                        message: '选择的模板错误',
+                        type: 'error'
+                    });
+
+                } else {
+                    this.$message({
+                        message: '导入失败，错误状态' + data,
+                        type: 'error'
+                    });
+
+                }
+
+                event.target.type = "text";
+                event.target.value = "";
+                event.target.type = "file";
+                event.target.name = "file";
+                vm.$forceUpdate();
+            }).catch((err) => {
+                this.$message({
+                    message: '请求失败！',
+                    type: 'error'
+                });
+            });
+        },
         onswitch(row) {
             //  debugger
             //点击设置是否考勤
@@ -446,6 +503,7 @@ export default {
                 })
         },
         SelectClassList1(id, s) {
+            debugger
             //班级
             getstudenlevel3({
                 Id: id,
diff --git a/src/views/teach-log/teach-log.vue b/src/views/teach-log/teach-log.vue
index 78eb4d7..ebbf407 100644
--- a/src/views/teach-log/teach-log.vue
+++ b/src/views/teach-log/teach-log.vue
@@ -7,16 +7,16 @@
             <!--  检索区域  -->
             <div class="seachbox">
                 <div class="seachbox">
-                    <!-- 学期检索 --><el-select v-model="queryParams.Term" placeholder="学期" filterable clearable
+                    <!-- 学期检索 --><!-- <el-select v-model="queryParams.Term" placeholder="学期" filterable clearable
                         size="small" class="ml-5 seachbox_input">
                         <el-option v-for="item in TermList" :key="item.name" :label="item.name" :value="item.value" />
-                    </el-select>
+                    </el-select> -->
                     <!-- 学院检索  -->
-                    <el-select v-model="queryParams.College" placeholder="学院" filterable clearable size="small"
+                    <!-- <el-select v-model="queryParams.College" placeholder="学院" filterable clearable size="small"
                         class="ml-5 seachbox_input">
                         <el-option v-for="item in CollegeList" :key="item.name" :label="item.name"
                             :value="item.value" />
-                    </el-select>
+                    </el-select> -->
                     <!-- 教室检索 -->
                     <el-select v-model="queryParams.Classroom" placeholder="教室" filterable clearable size="small"
                         class="ml-5 seachbox_input">
@@ -24,28 +24,28 @@
                             :value="item.name" />
                     </el-select>
                     <!--  周次检索 -->
-                    <el-select v-model="queryParams.Week" placeholder="周次" filterable clearable size="small"
+                    <!-- <el-select v-model="queryParams.Week" placeholder="周次" filterable clearable size="small"
                         @change="selectweek" class="ml-5 seachbox_input">
                         <el-option v-for="item in WeekList" :key="item.name" :label="item.name" :value="item.value" />
-                    </el-select>
+                    </el-select> -->
                     <!-- 教师检索  -->
                     <el-input v-model.trim="queryParams.Teacher" placeholder="教师" clearable size="small"
                         style="width:200px; margin:0px 10px 0px 0px "></el-input>
                     <!-- 节次检索 -->
-                    <el-select v-model="queryParams.Section" placeholder="节次" filterable clearable size="small"
+                    <!-- <el-select v-model="queryParams.Section" placeholder="节次" filterable clearable size="small"
                         class="ml-5 seachbox_input">
                         <el-option v-for="item in SectionList" :key="item.name" :label="item.name"
                             :value="item.value" />
-                    </el-select>
-                    <el-select v-model="queryParams.Status" placeholder="状态" filterable clearable size="small"
+                    </el-select> -->
+                    <!-- <el-select v-model="queryParams.Status" placeholder="状态" filterable clearable size="small"
                         class="ml-5 seachbox_input">
                         <el-option v-for="item in StatusList" :key="item.name" :label="item.name" :value="item.value" />
-                    </el-select>
+                    </el-select> -->
                     <!-- 日历检索 -->
 
-                    <el-date-picker v-model="queryParams.Date" value-format="YYYY-MM-DD" type="daterange"
+                   <!--  <el-date-picker v-model="queryParams.Date" value-format="YYYY-MM-DD" type="daterange"
                         @change="selecttimerange" range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期"
-                        style="margin-top: 10px;" />
+                        style="margin-top: 10px;" /> -->
 
                     <!-- 按钮——————搜索 -->
                     <el-button class="ml-5" style="margin-left: 10px;" type="primary"
@@ -70,64 +70,17 @@
             <el-table :data="tableData" border stripe :header-cell-style="{ 'text-align': 'center' }"
                 :scrollbar-always-on="true">
                 <!-- <el-table-column type="selection" width="55" align="center" /> -->
-                <el-table-column type="expand">
-                    <template #default="props">
-                        <div class="expandrowbox">
-                            <el-row class="expand-row">
-                                <el-col :span="6">
-                                    <span class="expand-key">学校: </span>
-                                    <span class="expand-value">{{ props.row.SchoolArea }}</span>
-                                </el-col>
-                                <el-col :span="6">
-                                    <span class="expand-key">学院: </span>
-                                    <span class="expand-value">{{ props.row.CollegeName }}</span>
-                                </el-col>
-                                <el-col :span="6">
-                                    <span class="expand-key">专业: </span>
-                                    <span class="expand-value">{{ props.row.MajorName }} </span>
-                                </el-col>
-                                <el-col :span="6">
-                                    <span class="expand-key">教师工号: </span>
-                                    <span class="expand-value">{{ props.row.TeacherNumber }} </span>
-                                </el-col>
-                            </el-row>
-                            <el-row class="expand-row">
-                                <el-col :span="6">
-                                    <span class="expand-key">学期: </span>
-                                    <span class="expand-value">{{ props.row.YearTerm }}</span>
-                                </el-col>
-                                <el-col :span="6">
-                                    <span class="expand-key">周次: </span>
-                                    <span class="expand-value">{{ props.row.Weeks }}</span>
-                                </el-col>
-                                <el-col :span="6">
-                                    <span class="expand-key">年级: </span>
-                                    <span class="expand-value">{{ props.row.Grade }} </span>
-                                </el-col>
-                                <el-col :span="6">
-                                    <span class="expand-key">课程类型: </span>
-                                    <span class="expand-value">{{ props.row.CourceType }} </span>
-                                </el-col>
-                            </el-row>
-                            <el-row class="expand-row">
-                                <el-col :span="6">
-                                    <span class="expand-key">楼名称: </span>
-                                    <span class="expand-value">{{ props.row.BuildingName }}</span>
-                                </el-col>
-                                <el-col :span="6">
-                                    <span class="expand-key">教务编号: </span>
-                                    <span class="expand-value">{{ props.row.AcademicNumber }}</span>
-                                </el-col>
-
-                            </el-row>
-                        </div>
-                    </template>
-                </el-table-column>
                 <el-table-column prop="TeacherName" align="center" label="教师名字" width="100">
                 </el-table-column>
-                <el-table-column prop="SDate" label="上课时间" align="left">
+                <el-table-column prop="TeacherTitle" align="center" label="教师职称" width="100">
                 </el-table-column>
-                <el-table-column prop="ScheduleName" align="center" label="节次名称" width="150">
+                <el-table-column prop="IsOutSide" align="center" label="校内/外教师" width="100">
+                    <template v-slot="scope">
+                        <el-tag type="success" v-if="!scope.row.IsOutSide">校内教师</el-tag>
+                        <el-tag v-if="scope.row.IsOutSide">校外教师</el-tag>
+                    </template>
+                </el-table-column>
+                <el-table-column prop="DateTime" label="日期" align="left">
                 </el-table-column>
                 <el-table-column prop="CourceName" align="left" label="课程名称">
                 </el-table-column>
@@ -135,10 +88,10 @@
                 </el-table-column>
                 <el-table-column prop="ClassroomName" align="center" label="教室名称" width="150">
                 </el-table-column>
-                <el-table-column prop="IsValid" align="center" label="是否有效" width="150">
+                <el-table-column prop="IsValid" align="center" label="按日期时间排课" width="150">
                     <template v-slot="scope">
-                        <el-tag type="danger" v-if="!scope.row.IsValid">无效</el-tag>
-                        <el-tag type="success" v-if="scope.row.IsValid">有效</el-tag>
+                        <el-tag type="success" v-if="!scope.row.IsByDate">是</el-tag>
+                        <el-tag type="danger" v-if="scope.row.IsByDate">否</el-tag>
                     </template>
                 </el-table-column>
                 <el-table-column label="操作" align="center" width="150" fixed="right">
@@ -171,40 +124,6 @@
             <el-drawer size="50%" v-model="drawerform" :title="drawerformtitle" :append-to-body="false">
                 <div class="demo-drawer__content">
                     <el-form label-position="right" ref="ruleForm" :rules="rules" label-width="150px" :model="formItem">
-                        <!-- 新增__校区 -->
-                        <el-form-item label="请选择校区">
-                            <el-select v-model="formItem.SchoolAreaCode" placeholder="请选择校区" disabled size="small"
-                                class="ml-5 seachbox_input">
-                                <el-option v-for="item in SchoolAreaList" :key="item.value" :label="item.name"
-                                    :value="item.value" />
-                            </el-select>
-                        </el-form-item>
-
-
-                        <!-- 新增__学期 -->
-                        <el-form-item label="请选择学期" prop="YearTerm">
-                            <el-select v-model="formItem.YearTerm" placeholder="学期" clearable size="small"
-                                class="ml-5 seachbox_input">
-                                <el-option v-for="item in TermList" :key="item.value" :label="item.name"
-                                    :value="item.value" />
-                            </el-select>
-                        </el-form-item>
-                        <!-- 新增__学院 -->
-                        <el-form-item label="请选择学院" prop="CollegeCode">
-                            <el-select filterable v-model="formItem.CollegeCode" placeholder="学院" clearable size="small"
-                                class="ml-5 seachbox_input">
-                                <el-option v-for="item in CollegeList" :key="item.name" :label="item.name"
-                                    :value="item.value" />
-                            </el-select>
-                        </el-form-item>
-                        <!-- 新增__教学楼 -->
-                        <el-form-item label="请选择教学楼" prop="BuildingCode">
-                            <!-- 要添加教学楼数组 --><el-select @change="ChangeBuild" v-model="formItem.BuildingCode"
-                                placeholder="教学楼" clearable size="small" class="ml-5 seachbox_input">
-                                <el-option v-for="item in BuildingList" :key="item.value" :label="item.name"
-                                    :value="item.value" />
-                            </el-select>
-                        </el-form-item>
                         <!-- 新增__教室 -->
                         <el-form-item label="请选择教室" prop="ClassroomCode">
                             <el-select v-model="formItem.ClassroomCode" placeholder="教室" clearable size="small"
@@ -214,28 +133,22 @@
                             </el-select>
                         </el-form-item>
                         <!-- 新增__按钮--添加专业班级 -->
-                        <el-form-item label="添加专业班级" prop="MajorClass">
-                            <el-button type="primary" round @click="Newbox"><el-icon size="20">
+                        <el-form-item label="添加班级" prop="MajorClass">
+                            <!-- <el-button type="primary" round @click="Newbox"><el-icon size="20">
                                     <Plus />
-                                </el-icon> 添加</el-button>
+                                </el-icon> 添加</el-button> -->
+                            <el-select ref="itemSelectclass" filterable multiple v-model="classformItem.ClassCode"
+                                placeholder="班级" clearable @change="classSelectclasscode">
+                                <el-option v-for="item in NewClassList" :key="item.name" :label="item.name"
+                                    :value="item.value">
+                                </el-option>
+                            </el-select>
                         </el-form-item>
-                        <!-- 添加内容展示 -->
-                        <el-form-item>
-                            <!-- ObjList -->
-                            <div class="div_forshow">
-                                <div class="div_show" v-for="(item, index) in zhaunclasslist" :key="index">
-                                    <div class="div_item"><span style="width:100px">专业：</span> {{ item.MajorCodename }}
-                                    </div>
-                                    <div class="div_item"> <span style="width:100px">班级：</span>{{ item.ClassCodename }}
-                                    </div>
-                                    <div class="div_btn">
-                                        <el-button class="btn_semiselect" @click="romveitrm(index)"><el-icon>
-                                                <SemiSelect />
-                                            </el-icon>
-                                        </el-button>
-                                    </div>
-                                </div>
-                            </div>
+                        <el-form-item label="校内/外教师" prop="xnw">
+                            <el-radio-group v-model="IsOutSide">
+                                <el-radio label="1">校内</el-radio>
+                                <el-radio label="2">校外</el-radio>
+                            </el-radio-group>
                         </el-form-item>
                         <!-- 新增__教师姓名 -->
                         <el-form-item label="教师姓名" prop="TeacherName">
@@ -244,10 +157,15 @@
                                 <el-option v-for="item in TeacherNameList" :key="item.Number" :label="item.Name"
                                     :value="item.Number">{{ item.Name }}({{ item.Number }})</el-option>>
                             </el-select> -->
-                            <el-input v-model="formItem.TeacherName" readonly placeholder="请选择教师" @click="modelteacher"
+                            <el-input v-if="IsOutSide==2" v-model="formItem.TeacherName" placeholder="请选择教师"
+                                autocomplete="off"></el-input>
+                            <el-input v-else v-model="formItem.TeacherName" readonly placeholder="请选择教师" @click="modelteacher"
                                 autocomplete="off"></el-input>
                         </el-form-item>
-                        <!-- 新增__周次 -->
+                        <el-form-item label="职称" prop="TeacherTitle">
+                            <el-input v-model="formItem.TeacherTitle" placeholder="请输入职称" autocomplete="off"></el-input>
+                        </el-form-item>
+                        <!-- 新增__周次
                         <el-form-item label="请选择周次" prop="Weeks">
                             <el-checkbox-group v-model="formItem.Weeks">
                                 <el-checkbox v-for="item in WeekList" :key="item.value" :label="item.value">{{
@@ -255,40 +173,72 @@
                                     }}</el-checkbox>
                             </el-checkbox-group>
                         </el-form-item>
-                        <!-- 新增__周几 -->
                         <el-form-item label="请选择周几" prop="WeekDay">
                             <el-radio-group v-model="formItem.WeekDay">
                                 <el-radio v-for="item in DayList" :key="item.value" :label="item.value">
                                     {{ item.name }}</el-radio>
                             </el-radio-group>
                         </el-form-item>
-                        <!-- 新增__节次 -->
                         <el-form-item label="请选择节次" prop="ScheduleName">
                             <el-checkbox-group v-model="formItem.ScheduleName">
                                 <el-checkbox v-for="item in AddSectionList" :key="item.value" :label="item.value">{{
                                     item.name
                                     }}</el-checkbox>
                             </el-checkbox-group>
+                        </el-form-item>-->
+                        <el-form-item label="日期" prop="Date">
+                            <el-date-picker
+                                v-model="formItem.Date"
+                                type="date"
+                                placeholder="请选择日期"
+                                format="YYYY-MM-DD"
+                                value-format="YYYY-MM-DD"
+                            />
+                        </el-form-item>
+                        <el-form-item label="时间" prop="Time">
+                            <el-time-picker
+                                v-model="formItem.Time"
+                                is-range
+                                range-separator="-"
+                                start-placeholder="开始时间"
+                                end-placeholder="结束时间"
+                                :format="'HH:mm'"
+                                value-format="HH:mm"
+                            />
                         </el-form-item>
                         <!-- 新增__课程 -->
-                        <el-form-item label="请填写课程名称" prop="CourceName">
+                        <el-form-item label="课程名称" prop="CourceName">
                             <el-input placeholder="请填写课程" clearable v-model.trim="formItem.CourceName"> </el-input>
                         </el-form-item>
-                        <!-- 新增__课程类型 -->
-                        <el-form-item label="请填写课程类型" prop="CourceType">
-                            <el-select v-model="formItem.CourceType" placeholder="请选择类型" clearable size="small"
-                                class="ml-5 seachbox_input">
-                                <el-option v-for="item in CourseTypeList" :key="item.name" :label="item.name"
-                                    :value="item.value" />
-                            </el-select>
+                        <el-form-item label="午别时段" prop="TimeInterval">
+                            <el-input placeholder="请填写午别时段" clearable v-model.trim="formItem.TimeInterval"> </el-input>
                         </el-form-item>
+                        <el-form-item label="教学形式" prop="TeachingForm">
+                            <el-input placeholder="请填写午别时段" clearable v-model.trim="formItem.TeachingForm"> </el-input>
+                        </el-form-item>
+                        <el-form-item label="按日期时间排课" prop="IsByDate">
+                            <el-radio-group v-model="formItem.IsByDate">
+                                <el-radio label="1">是</el-radio>
+                                <el-radio label="2">否</el-radio>
+                            </el-radio-group>
+                        </el-form-item>
+                        <!-- 新增__课程类型 -->
+                        <!--
+                            <el-form-item label="请填写课程类型" prop="CourceType">
+                                <el-select v-model="formItem.CourceType" placeholder="请选择类型" clearable size="small"
+                                    class="ml-5 seachbox_input">
+                                    <el-option v-for="item in CourseTypeList" :key="item.name" :label="item.name"
+                                        :value="item.value" />
+                                </el-select>
+                            </el-form-item>
+                        -->
                         <!-- 新增__状态 -->
-                        <el-form-item label="是否有效" prop="IsValid">
+                        <!-- <el-form-item label="是否有效" prop="IsValid">
                             <el-radio-group v-model="formItem.IsValid">
                                 <el-radio v-for="item in youxiaolist" :key="item.value" :label="item.value">
                                     {{ item.name }}</el-radio>
                             </el-radio-group>
-                        </el-form-item>
+                        </el-form-item> -->
                     </el-form>
 
                     <!-- <div class="demo-drawer__footer demo-drawerchange__footer ">
@@ -318,35 +268,35 @@
                     <div class="card-contain">
                         <el-form label-width=" 150px" v-model="classformItem" :rules="NewRules" ref="ruleForm1">
                             <!-- 添加页面---学院 -->
-                            <el-form-item label="请选择学院" prop="College">
+                            <!-- <el-form-item label="请选择学院" prop="College">
                                 <el-select filterable clearable size="small" v-model="classformItem.CollegeCode"
                                     placeholder="学院" @change="CollegeChange">
                                     <el-option v-for="item in NewCollegeList" :key="item.name" :label="item.name"
                                         :value="item.value">
                                     </el-option>
                                 </el-select>
-                            </el-form-item>
+                            </el-form-item> -->
                             <!-- 添加页面---专业-->
-                            <el-form-item label="请选择专业" prop="Major">
+                            <!-- <el-form-item label="请选择专业" prop="Major">
                                 <el-select ref="itemSelectmajor" filterable clearable size="small"
                                     v-model="classformItem.MajorCode" placeholder="专业" @change="MajorChange">
                                     <el-option v-for="item in NewMajorList" :key="item.name" :label="item.name"
                                         :value="item.value">
                                     </el-option>
                                 </el-select>
-                            </el-form-item>
+                            </el-form-item> -->
                             <!-- 添加页面---年级 -->
-                            <el-form-item label="请选择年级" prop="Grade">
+                            <!-- <el-form-item label="请选择年级" prop="Grade">
                                 <el-select filterable clearable size="small" v-model="classformItem.Grade"
                                     placeholder="年级" @change="GradeChange">
                                     <el-option v-for="item in NewGradeList " :key="item.name" :label="item.name"
                                         :value="item.value">
                                     </el-option>
                                 </el-select>
-                            </el-form-item>
+                            </el-form-item> -->
                             <!-- 添加页面---班级 -->
                             <el-form-item label="请选择班级" prop="Class">
-                                <el-select ref="itemSelectclass" filterable v-model="classformItem.ClassCode"
+                                <el-select ref="itemSelectclass" filterable multiple v-model="classformItem.ClassCode"
                                     placeholder="班级" size="small" clearable @change="classSelectclasscode">
                                     <el-option v-for="item in NewClassList" :key="item.name" :label="item.name"
                                         :value="item.value">
@@ -432,6 +382,7 @@ export default {
             },
             //新增页
             drawerform: false,    //抽屉开关
+            IsOutSide:'1',
             //新增  ----form参数
             formItem: {
                 AcademicNumber: "",
@@ -444,7 +395,10 @@ export default {
                 BuildingCode: "",
                 Date: "",
                 falseDate: "",
+                xnw:'1',
                 Weeks: [],
+                Date:'',
+                Time:'',
                 WeekDay: "",
                 ScheduleName: [],
                 CourceName: "",
@@ -453,6 +407,8 @@ export default {
                 IsValid: true,
                 TeacherNumber: "",
                 TeacherName: "",
+                TeacherTitle:"",
+                IsByDate:'1'
             },
             //新增  -----form数组列表
             isedit: false,
@@ -911,6 +867,8 @@ export default {
                 Gradename: "",
             };
             this.getNewCollegeListinfo();
+
+            this.getNewClassListinfo()
         },
         //获取学院信息 --这里获取学院信息有点重复
         getNewCollegeListinfo() {
@@ -981,20 +939,24 @@ export default {
 
         classSelectclasscode(e) {
             //弹框里选择班级
-            //  debugger;
+            debugger;
             let obj = {};
-            obj = this.NewClassList.find((item) => { // 这里的userList就是上面遍历的数据源
+            /* obj = this.NewClassList.find((item) => { // 这里的userList就是上面遍历的数据源
                 return item.value === e; // 筛选出匹配数据
             });
             this.classformItem.ClassCode = obj.value;
-            this.classformItem.ClassCodename = obj.name;
+            this.classformItem.ClassCodename = obj.name; */
+
+            
+            
+
         },
 
         //获取班级 
         getNewClassListinfo(grade) {
             getNewClassList({
-                majorCode: this.classformItem.MajorCode,
-                grade: grade,
+                majorCode: 'e3649c',
+                grade: '',
             }).then((res) => {
                 this.NewClassList = res
             }).catch((err) => {
@@ -1040,7 +1002,11 @@ export default {
                 this.AddInitialization();
             }, 200);
 
+           
+            this.formItem.xnw = '1'
+            console.log(this.formItem);
 
+            this.getNewClassListinfo()
 
         },
         edititem(info) {
@@ -1052,6 +1018,8 @@ export default {
             // 初始化
             this.AddInitialization();
             this.geteditdeails(info.TeachingLogId);
+
+            this.getNewClassListinfo()
         },
         //  
         getzhaunlist(datalist) {
@@ -1101,9 +1069,19 @@ export default {
         geteditdeails(id) {
             //获取详情
             getedit({ gtid: id }).then((res) => {
-                //  debugger
+                
                 let data = res;
+                console.log(data.ClassCode.replace(/"([^"]*)"/, '$1').split(','));
+                
+                this.classformItem = {
+                    ClassCode: data.ClassCode.replace(/"([^"]*)"/, '$1').split(','),
+                }
+
+                // Time: `${this.formItem.Time[0]}-${this.formItem.Time[1]}`,
+
                 this.formItem = {
+                    TeacherTitle: data.TeacherTitle,
+                    IsByDate:data.IsByDate,
                     AcademicNumber: data.AcademicNumber,
                     YearTerm: data.YearTerm,
                     SchoolAreaCode: data.SchoolAreaCode,
@@ -1119,6 +1097,7 @@ export default {
                     CourceName: data.CourceName,
                     WeekTime: data.WeekTime,
                     Grade: data.Grade,
+                    xnw:'1',
                     TeacherNumber: data.TeacherNumber,
                     Weeks: getsplit(data.Weeks),
                     TeacherName: data.TeacherName,
@@ -1226,38 +1205,51 @@ export default {
             this.$refs[formName].validate((valid) => {
                 if (valid) {
 
-                    if (vm.zhaunclasslist.length == 0) {
+                    /* if (vm.zhaunclasslist.length == 0) {
 
                         this.$message({
                             message: '专业班级不能为空！',
                             type: 'error'
                         });
                         return false;
-                    }
+                    } */
+
+                    this.classformItem.MajorCode = new Array(this.classformItem.ClassCode.length).fill('e3649c').join(',')
+                    console.log(this.formItem.Date);
+                    console.log(this.formItem.Time);
 
                     let datas = {
-                        AcademicNumber: vm.formItem.AcademicNumber, //自动生成，不需填写
-                        YearTerm: vm.formItem.YearTerm, //学期，必填
-                        SchoolAreaCode: vm.formItem.SchoolAreaCode, //	校区Code，必填
-                        CollegeCode: vm.formItem.CollegeCode, //	学院Code，单个Code值，必填
-                        MajorCode: vm.getzhaunclasslist("MajorCode").toString(), //专业Code，可多个Code值
-                        ClassCode: vm.getzhaunclasslist("ClassCode").toString(), //班级Code，可多个Code值，必填
-                        BuildingCode: vm.formItem.BuildingCode, //楼Code
+                        AcademicNumber: '', //自动生成，不需填写
+                        YearTerm: '2025-1', //学期，必填
+                        SchoolAreaCode: 1, //	校区Code，必填
+                        CollegeCode: 101, //	学院Code，单个Code值，必填
+                        MajorCode: this.classformItem.MajorCode, //专业Code，可多个Code值
+                        ClassCode: this.classformItem.ClassCode.join(','), //班级Code，可多个Code值，必填
+                        BuildingCode: '001', //楼Code
                         ClassroomCode: vm.formItem.ClassroomCode, //教室Code
-                        Weeks: vm.formItem.Weeks.toString(), //上课周次 例如,1,2, 代表第一周和第二周
-                        WeekDay: vm.formItem.WeekDay, //上课时间 周几 新增 2020改 例如：3 即 星期三
-                        ScheduleName: vm.formItem.ScheduleName.toString()
-                            ? vm.formItem.ScheduleName.toString().replace(/,/g, "")
-                            : "", //节次
+                        Weeks: 1, //上课周次 例如,1,2, 代表第一周和第二周
+                        WeekDay: 1, //上课时间 周几 新增 2020改 例如：3 即 星期三
+                        ScheduleName: '01', //节次
                         CourceName: vm.formItem.CourceName, //课程名称
                         CourceCode: "", //	课程代码
-                        CourceType: vm.formItem.CourceType, //课程类型 暂为空即可
+                        CourceType: '', //课程类型 暂为空即可
                         Grade: "", //年级
                         IsValid: vm.formItem.IsValid, //是否有效
+                        xnw:'1',
                         TeacherNumber: vm.formItem.TeacherNumber, //任课教师工号
                         TeacherName: vm.formItem.TeacherName, //教师姓名
                         TeachingLogId: 0,
+
+                        IsOutSide: this.IsOutSide == '1' ? false : true,
+                        TeacherTitle: this.formItem.TeacherTitle,
+                        Date: this.formItem.Date,
+                        Time: `${this.formItem.Time[0]}-${this.formItem.Time[1]}`,
+                        IsByDate: this.formItem.IsByDate == '1' ? true : false,
+                        TimeInterval:0,
+                        TeachingForm:0
                     };
+
+                    debugger
                     postaddinfo(datas).then((res) => {
                         let data = res;
                         if (data == 1) {
@@ -1440,6 +1432,7 @@ export default {
                         CourceType: vm.formItem.CourceType, //课程类型 暂为空即可
                         Grade: vm.formItem.Grade, //年级
                         IsValid: vm.formItem.IsValid, //是否有效
+                        xnw:'1',
                         TeacherNumber: vm.formItem.TeacherNumber, //任课教师工号
                         TeacherName: vm.formItem.TeacherName, //教师姓名
                         TeachingLogId: vm.formItem.TeachingLogId,
diff --git a/src/views/teacher-information/teacher-information.vue b/src/views/teacher-information/teacher-information.vue
index dd46df9..e869cbe 100644
--- a/src/views/teacher-information/teacher-information.vue
+++ b/src/views/teacher-information/teacher-information.vue
@@ -9,9 +9,9 @@
 
             <div class="seachbox">
                 <el-input v-model.trim="queryParams.nname" placeholder="姓名" clearable class="ml-5 seachbox_input"
-                    size="small" style="margin:0px 20px 0px 0px"></el-input>
+                    size="small" style="margin:0rem 1.25rem 0rem 0rem"></el-input>
                 <el-input v-model.trim="queryParams.num" placeholder="工号" class="ml-5 seachbox_input" size="small"
-                    style="margin:0px 20px 0px 0px" clearable></el-input>
+                    style="margin:0rem 1.25rem 0rem 0rem" clearable></el-input>
 
 
                 <el-select ref="itemSelectcollege" v-model="queryParams.type" placeholder="类型" filterable clearable
@@ -115,22 +115,26 @@
         <el-drawer v-model="drawerform" :title="drawerformtitle" :append-to-body="false">
             <!-- 新增修改左侧框 -->
             <div class="demo-drawer__content">
-                <el-form label-position="right" ref="ruleForm" :rules="rules" label-width="100px" :model="formItem">
-                    <p slot="title" style="color: #1ea0ff;border-left: 2px solid #1ea0ff;padding-left: 8px;">基本信息</p>
+                <el-form label-position="right" ref="ruleForm" :rules="rules" label-width="6.25rem" :model="formItem">
+                    <p slot="title" style="color: #1ea0ff;border-left: .125rem solid #1ea0ff;padding-left: .5rem;">基本信息</p>
                     <el-form-item label="姓名" prop="Name">
                         <el-input v-model.trim="formItem.Name" placeholder="请输入姓名" autocomplete="off"></el-input>
                     </el-form-item>
-                    <el-form-item label="工号" prop="Num">
+                    <!-- <el-form-item label="工号" prop="Num">
                         <el-input v-model.trim="formItem.Num" placeholder="请输入工号" maxlength="20"
-                            autocomplete="off"></el-input>
-                    </el-form-item>
+                            autocomplete="off" readonly></el-input>
+                    </el-form-item> -->
                     <el-form-item label="类型" prop="selectIdType">
                         <el-select v-model="formItem.selectIdType" placeholder="类型" clearable>
-                            <el-option v-for="item in typeList" :key="item.value" :label="item.name"
-                                :value="item.value" />
+                            <el-option key="1" label="校内" value="1" />
+                            <el-option key="2" label="校外" value="2" />
                         </el-select>
                     </el-form-item>
-                    <el-form-item label="请选择学校" prop="schoolId">
+                    <el-form-item label="职称" prop="Num">
+                        <el-input v-model.trim="formItem.Num" placeholder="请输入职称" maxlength="20"
+                            autocomplete="off"></el-input>
+                    </el-form-item>
+                    <!-- <el-form-item label="请选择学校" prop="schoolId">
                         <el-select v-model="formItem.schoolId" placeholder="选择学校" clearable filterable>
                             <el-option v-for="item in schoolList" :key="item.value" :label="item.name"
                                 :value="item.value" />
@@ -142,14 +146,14 @@
                             <el-option v-for="item in collegeList1" :key="item.value" :label="item.name"
                                 :value="item.value" />
                         </el-select>
-                    </el-form-item>
+                    </el-form-item> -->
                     <el-form-item label="在职状态" prop="Status">
                         <el-select v-model="formItem.Status" placeholder="请选择在职状态" clearable>
                             <el-option v-for="item in statusList1" :key="item.value" :label="item.name"
                                 :value="item.value" />
                         </el-select>
                     </el-form-item>
-                    <p slot="title" style="color: #1ea0ff;border-left: 2px solid #1ea0ff;padding-left: 8px;">联系方式</p>
+                    <p slot="title" style="color: #1ea0ff;border-left: .125rem solid #1ea0ff;padding-left: .5rem;">联系方式</p>
                     <el-form-item label="电话" prop="Phone">
                         <el-input v-model.trim="formItem.Phone" placeholder="请输入电话" autocomplete="off"></el-input>
                     </el-form-item>
@@ -197,7 +201,7 @@ export default {
                 selectId: "",
                 Name: "",
                 Num: "",
-                selectIdType: 1,
+                selectIdType: '1',
                 Status: 2,
                 // JoinTime: "",
                 Phone: "",