From 88493b26d5dbfb132efd680a392c66b82382ceec Mon Sep 17 00:00:00 2001
From: gjz <393355653@qq.com>
Date: Fri, 14 Feb 2025 16:31:15 +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

---
 src/api/courseStatistics.js                   | 11 +++++
 .../atten-information/attenStuDetails.vue     | 40 +++----------------
 .../atten-information/class-attendance.vue    | 26 ++++++------
 .../atten-information/student-attendance.vue  | 20 +++++-----
 .../collage-information.vue                   |  3 +-
 src/views/courseStatistics/courseInfo.vue     |  1 -
 .../courseStatistics/courseStatistics.vue     | 21 ++++++++--
 src/views/courseStatistics/sectionInfo.vue    | 16 ++++----
 .../student-information.vue                   |  2 +
 src/views/teach-log/teach-log.vue             |  2 +-
 .../teacher-information.vue                   | 25 ++----------
 11 files changed, 72 insertions(+), 95 deletions(-)

diff --git a/src/api/courseStatistics.js b/src/api/courseStatistics.js
index aca83aa..fa40885 100644
--- a/src/api/courseStatistics.js
+++ b/src/api/courseStatistics.js
@@ -1,5 +1,16 @@
 import axios from "@/utils/http/index"
 
+/**
+ *  get 获取table(表格信息)
+ * @param prams 
+ * @returns 
+ */
+export function getTabledatasss(params) {
+    return axios({
+        url: '/api/AttendanceInfo/GetLessonAttendanceInfoListByCource',
+        params
+    })
+}
 
 /**
  *  get 获取Term(学期) 数组
diff --git a/src/views/atten-information/attenStuDetails.vue b/src/views/atten-information/attenStuDetails.vue
index f595aa5..7a34ac6 100644
--- a/src/views/atten-information/attenStuDetails.vue
+++ b/src/views/atten-information/attenStuDetails.vue
@@ -22,11 +22,6 @@
       </el-col>
     </el-row>
     <el-row style="padding: 0 20px; margin-top: 10px">
-      <el-col :span="6" style="margin-left: 10px">
-        <div class="first_line">
-          <span class="first_linePro" @click="handlerGoPro">专业名称：{{ stuProfession }}</span>
-        </div>
-      </el-col>
       <el-col :span="10" style="margin-left: 10px">
         <div class="first_line">
           <span class="first_lineClass" @click="handlerGoClass">班级名称：{{ stuClass }}</span>
@@ -34,27 +29,6 @@
       </el-col>
     </el-row>
     <el-row style="padding: 0 20px; margin-top: 10px">
-      <!-- <el-col :span="4" style="margin-left:10px;">
-        <el-select :value="semesterNum" @on-select="selectSemester" placeholder="学期">
-          <Option
-            v-for="item in semesterList"
-            :value="item.value"
-            :key="item.value"
-          >{{ item.name }}</Option>
-        </el-select>
-      </el-col> -->
-      <el-col :span="4" style="margin-left: 10px">
-        <el-select v-model="monthNum" @change="selectMonth" placeholder="月份">
-
-          <el-option v-for="item in monthList" :key="item.name" :label="item.name" :value="item.value" />
-        </el-select>
-      </el-col>
-      <el-col :span="4" style="margin-left: 10px">
-        <el-select v-model="weekNum" @change="selectWeek" placeholder="周次">
-
-          <el-option v-for="item in weekList" :key="item.name" :label="item.name" :value="item.value" />
-        </el-select>
-      </el-col>
       <el-col :span="4" style="margin-left: 10px">
         <el-select v-model="courseNum" clearable @change="selectCourse" placeholder="课程">
           <el-option v-for="item in courseList" :key="item.value" :label="item.name" :value="item.value" />
@@ -70,8 +44,6 @@
     <el-row style="margin-top: 10px" ref="row">
       <el-col :span="24" class="padding-left-10">
         <el-card class="mCard">
-          <h2 class="card_txt">2019~2020学年第一学期（本学期）</h2>
-
           <el-row>
             <el-col :lg="10" :sm="24">
               <div id="echartsBox" style="width: 100%; height: 400px"></div>
@@ -289,7 +261,7 @@ export default {
 
       GetcollegeMajorInfo({
         CollegeId: id,
-        Signal: s,
+        Signal: 1,
         isAll,
       })
         .then((res) => {
@@ -311,7 +283,7 @@ export default {
         endTime: this.timerange[1] ? this.timerange[1] : "",
         month: this.monthNum,
         week: this.weekNum,
-        Signal: this.timerange[0] ? 1 : 2,
+        Signal: 1,
       };
 
       GetStudentAbsenceCourceList(params)
@@ -418,7 +390,7 @@ export default {
         endTime = "",
         month = "",
         week = "",
-        Signal = 2, //月份/周次（2）、时间区间（1）
+        Signal = 1, //月份/周次（2）、时间区间（1）
       } = options;
 
       GetStudentAbsenceRecordLsit(
@@ -432,7 +404,7 @@ export default {
           endTime: endTime,
           month: month,
           week: week,
-          Signal: Signal,
+          Signal: 1,
         }
       ).then((res) => {
         let datas = res;
@@ -616,7 +588,7 @@ export default {
 
       GetcollegeMajorInfo({
         CollegeId: CollegeId,
-        Signal: Signal
+        Signal: 1
       }).then((res) => {
         this.professionList = res;
       })
@@ -1148,7 +1120,7 @@ export default {
         endTime: this.timerange[1] || "",
         month: this.monthNum,
         week: this.weekNum,
-        Signal: this.timerange[0] ? 1 : 2,
+        Signal: 1,
       };
 
       // debugger
diff --git a/src/views/atten-information/class-attendance.vue b/src/views/atten-information/class-attendance.vue
index bd9a9c1..6e5f9ef 100644
--- a/src/views/atten-information/class-attendance.vue
+++ b/src/views/atten-information/class-attendance.vue
@@ -2,7 +2,7 @@
   <div style="padding: 0 10px">
     <el-row style="line-height: 62px; padding: 0 30px">
       <el-col :span="20">
-        <h2 class="page-h2" style="color: #000">考勤变化图: {{ clasName }}</h2>
+        <h2 class="page-h2" style="color: #000">考勤变化图</h2>
       </el-col>
       <!-- <el-col :span="4">
         <Button
@@ -50,8 +50,8 @@
                 <span style="
                     display: inline-block;
                     margin-right: 8px;
-                    width: 42%;
-                    text-align: center;
+                    width: 100%;
+                    text-align: left;
                   ">{{ item.StudentName }}</span>
 
                 <el-progress :percentage="item.attenRadtio" :color="['#1AC7E9', '#1BDCBF']" />
@@ -64,14 +64,14 @@
         <h3 style="text-align: center">出勤率变化图</h3>
         <div style="margin-left: 60px; margin-top: 33px">
           <el-row>
-            <el-col :span="5">
+            <!-- <el-col :span="5">
 
               <el-radio-group v-model="dateRadio" @change="handleChan">
                 <el-radio label="日">日</el-radio>
                 <el-radio label="周">周</el-radio>
                 <el-radio label="月">月</el-radio>
               </el-radio-group>
-            </el-col>
+            </el-col> -->
             <template v-if="dateRadio === '日'">
               <el-col :span="4" push="5">
                 <el-select v-model="weekNum" @change="selectWeek" placeholder="周次">
@@ -301,7 +301,7 @@ export default {
 
       GetcollegeMajorInfo({
         CollegeId: id,
-        Signal: s,
+        Signal: 1,
         isAll,
       }).then((res) => {
         this.majorList = res;
@@ -449,10 +449,10 @@ export default {
       };
       if (this.dateRadio === "周") {
         // params.week = 0;
-        params.Signal = 2;
+        params.Signal = 1;
       } else if (this.dateRadio === "月") {
         // params.month = 0;
-        params.Signal = 3;
+        params.Signal = 1;
       } else if (this.dateRadio === "日") {
         params.week = this.weekNum;
         // params.Signal = 1;
@@ -467,12 +467,12 @@ export default {
         endTime: "",
         week: "",
         month: "",
-        Signal: 2,
+        Signal: 1,
       };
       if (this.dateRadio === "周") {
-        params.Signal = 2;
+        params.Signal = 1;
       } else if (this.dateRadio === "月") {
-        params.Signal = 3;
+        params.Signal = 1;
       } else if (this.dateRadio === "日") {
         params.Signal = 1;
       }
@@ -510,9 +510,9 @@ export default {
       };
       //  this.HTTPCount++;
       if (this.dateRadio === "周") {
-        params.Signal = 2;
+        params.Signal = 1;
       } else if (this.dateRadio === "月") {
-        params.Signal = 3;
+        params.Signal = 1;
       } else if (this.dateRadio === "日") {
         params.week = this.weekNum;
         params.Signal = 1;
diff --git a/src/views/atten-information/student-attendance.vue b/src/views/atten-information/student-attendance.vue
index 67b48a0..8709fe6 100644
--- a/src/views/atten-information/student-attendance.vue
+++ b/src/views/atten-information/student-attendance.vue
@@ -20,10 +20,10 @@
       </div> -->
     </el-row>
     <el-row ref="row" style="padding: 0 30px" class="selects">
-      <el-col :span="4">
+      <!-- <el-col :span="4">
         <span>专业名称：</span>
         <span>{{ stuProName }}</span>
-      </el-col>
+      </el-col> -->
       <el-col :span="6">
         <span>班级名称：</span>
         <span>{{ stuClassName }}</span>
@@ -45,8 +45,8 @@
                 <span style="
                     display: inline-block;
                     margin-right: 8px;
-                    width: 40%;
-                    text-align: right;
+                    width: 100%;
+                    text-align: left;
                   ">{{ item.StudentName }}</span>
                 <el-progress :percentage="item.attenRadtio" :color="['#1AC7E9', '#1BDCBF']" />
               </li>
@@ -60,13 +60,13 @@
         <h3 style="text-align: center">考勤统计图</h3>
         <div style="margin-left: 60px; margin-top: 33px">
           <el-row>
-            <el-col :span="5">
+            <!-- <el-col :span="5">
               <el-radio-group v-model="dateRadio" @change="handleChan">
                 <el-radio label="日">日</el-radio>
                 <el-radio label="周">周</el-radio>
                 <el-radio label="月">月</el-radio>
               </el-radio-group>
-            </el-col>
+            </el-col> -->
             <template v-if="dateRadio === '日'">
               <el-col :span="4">
                 <el-select v-model="weekNum" @change="selectWeek" placeholder="周次">
@@ -329,7 +329,7 @@ export default {
 
       GetcollegeMajorInfo({
         CollegeId: id,
-        Signal: s,
+        Signal: 1,
       }).then((res) => {
         this.majorList = res;
       })
@@ -345,7 +345,7 @@ export default {
 
       GetcollegeMajorInfo({
         Id: id,
-        Signal: s,
+        Signal: 1,
       }).then((res) => {
         this.classList = res;
       })
@@ -429,9 +429,9 @@ export default {
         Signal: 1,
       };
       if (this.dateRadio === "周") {
-        params.Signal = 2;
+        params.Signal = 1;
       } else if (this.dateRadio === "月") {
-        params.Signal = 3;
+        params.Signal = 1;
       } else if (this.dateRadio === "日") {
         params.week = this.weekNum;
         params.Signal = 1;
diff --git a/src/views/collage-information/collage-information.vue b/src/views/collage-information/collage-information.vue
index 48b3689..2c8b435 100644
--- a/src/views/collage-information/collage-information.vue
+++ b/src/views/collage-information/collage-information.vue
@@ -699,10 +699,9 @@ export default {
                         MajorId: 1,
                         CounselorNum: '',
 
-                        HeadTeacherNum: this.formItem.TeacherNumber
+                        HeadTeacherNum: this.formItem.HeadTeacherNum
                     };
                     
-                    debugger
                     console.log(datas);
                     
                     postClassInfoeditinfo(datas).then((res) => {
diff --git a/src/views/courseStatistics/courseInfo.vue b/src/views/courseStatistics/courseInfo.vue
index 0a9f8f2..f6b23d8 100644
--- a/src/views/courseStatistics/courseInfo.vue
+++ b/src/views/courseStatistics/courseInfo.vue
@@ -618,7 +618,6 @@ export default {
                 termName: '',
             }).then((res) => {
                 this.tableData = res;
-
                 // debugger
                 let data = res;
                 if (data.length > 0) {
diff --git a/src/views/courseStatistics/courseStatistics.vue b/src/views/courseStatistics/courseStatistics.vue
index e03a2a3..b8ecf60 100644
--- a/src/views/courseStatistics/courseStatistics.vue
+++ b/src/views/courseStatistics/courseStatistics.vue
@@ -61,7 +61,7 @@
                 </el-table-column>
                 <el-table-column prop="weeksAndWeekday" align="center" label="节次">
                     <template v-slot="scope">
-                        <span>{{ scope.row.ScheduleName }}({{ scope.row.AcademicNumber }})</span>
+                        <span>{{ scope.row.ScheduleName }}</span>
                     </template>
                 </el-table-column>
 
@@ -92,7 +92,7 @@
 import { nanoid } from 'nanoid'
 import { getsplit } from "@/utils/common.js"
 
-import { getTermList, getCollegeList, getcourseList, getTabledata } from "@/api/courseStatistics.js"
+import { getTermList, getCollegeList, getcourseList, getTabledata , getTabledatasss } from "@/api/courseStatistics.js"
 export default {
     name: 'courseStatistics_index',
     components: {
@@ -226,8 +226,21 @@ export default {
         },
         // 检索完成  
         detailTableItem(row) {
+            getTabledatasss({
+                courceCode: row.CourceCode,
+                teacherNumber: row.TeacherNumber,
+                classroomCode: row.ClassroomCode,
+                termName: '',
+            }).then((res) => {
+                const data = res[0]
+                this.$router.push({
+                    name: "sectionInfos",
+                    query: { academicNumber: data.AcademicNumber, ClassroomName: data.ClassroomName, WeekTime: data.WeekTime, WeekDay: data.WeekDay, TeacherName: `${data.TeacherName}(${data.TeacherNumber})` },
+                }); 
+            })
+
             // debugger
-            let argu = {
+            /* let argu = {
                 courseId: row.CourceCode,
                 ClassroomCode: row.ClassroomCode,
                 TeacherNumber: row.TeacherNumber,
@@ -236,7 +249,7 @@ export default {
                 name: "courseInfos",
                 query: argu,
 
-            });
+            }); */
         },
         //初始化
         Initialization() {
diff --git a/src/views/courseStatistics/sectionInfo.vue b/src/views/courseStatistics/sectionInfo.vue
index c9283dc..609112c 100644
--- a/src/views/courseStatistics/sectionInfo.vue
+++ b/src/views/courseStatistics/sectionInfo.vue
@@ -3,17 +3,17 @@
         <el-row style="line-height: 62px; padding: 0 30px">
             <el-col :span="24">
                 <el-row class="page_p">
-                    <el-col :span="6"><span class="page_p_txt">学期：{{ termname }}</span></el-col>
-                    <el-col :span="6"><span class="page_p_txt">节次：第{{ WeekTime }}周 {{ WeekDay }} ({{ Schedulename }})
-                        </span></el-col>
-                    <el-col :span="6"><span class="page_p_txt">教室：{{ ClassroomName }}</span></el-col>
+                    <!-- <el-col :span="6"><span class="page_p_txt">学期：{{ termname }}</span></el-col> -->
+                    <el-col :span="8">
+                        <span class="page_p_txt">节次： {{ WeekDay }} ({{ Schedulename }})</span>
+                    </el-col>
+                    <el-col :span="5"><span class="page_p_txt">教室：{{ ClassroomName }}</span></el-col>
                     <el-col :span="6"><span class="page_p_txt">课程：{{ CourceName }}</span></el-col>
+                    <el-col :span="5"> <span class="page_p_txt">教师：{{ TeacherName }}</span></el-col>
                 </el-row>
-                <el-row class="page_p">
-                    <el-col :span="6"> <span class="page_p_txt">教师：{{ TeacherName }}</span></el-col>
+                <!-- <el-row class="page_p">
                     <el-col :span="6"><span class="page_p_txt">上课日期：{{ shkDate }}</span></el-col>
-
-                </el-row>
+                </el-row> -->
             </el-col>
         </el-row>
         <el-row style="padding: 0 20px; margin-top: 10px">
diff --git a/src/views/student-information/student-information.vue b/src/views/student-information/student-information.vue
index be1626b..8ef38dc 100644
--- a/src/views/student-information/student-information.vue
+++ b/src/views/student-information/student-information.vue
@@ -57,6 +57,8 @@
                 </el-table-column>
                 <el-table-column prop="Phone" align="center" label="电话">
                 </el-table-column>
+                <el-table-column prop="Sex" align="center" label="性别">
+                </el-table-column>
                 <el-table-column prop="Email" align="center" label="邮箱">
                 </el-table-column>
                 <el-table-column label="操作" align="center" width="150" fixed="right">
diff --git a/src/views/teach-log/teach-log.vue b/src/views/teach-log/teach-log.vue
index 55f5c64..4a24016 100644
--- a/src/views/teach-log/teach-log.vue
+++ b/src/views/teach-log/teach-log.vue
@@ -606,7 +606,7 @@ export default {
                         type: 'success'
                     });
                     this.uploadkaowushow = false;
-                    this.gettableinfo(this.pageobj.pageNum);
+                    this.getTabledatainfo(this.pageobj.pageNum);
                 } else if (data == 2) {
                     this.$message({
                         message: '文件中没有数据',
diff --git a/src/views/teacher-information/teacher-information.vue b/src/views/teacher-information/teacher-information.vue
index e10598c..e1394ab 100644
--- a/src/views/teacher-information/teacher-information.vue
+++ b/src/views/teacher-information/teacher-information.vue
@@ -54,10 +54,6 @@
                                     <span class="expand-key">QQ号: </span>
                                     <span class="expand-value">{{ props.row.QQ }}</span>
                                 </el-col>
-                                <el-col :span="6">
-                                    <span class="expand-key">邮箱: </span>
-                                    <span class="expand-value">{{ props.row.Email }} </span>
-                                </el-col>
                             </el-row>
                             <el-row class="expand-row">
                                 <el-col :span="6">
@@ -85,12 +81,10 @@
                         {{ scope.row.IsOutSide == false ? '校内' : '校外'}}
                     </template>
                 </el-table-column>
-                <el-table-column prop="Title" align="center" label="职称">
+                <el-table-column prop="Title" align="center" label="职务/职称">
                 </el-table-column>
                 <el-table-column prop="Phone" align="center" label="电话">
                 </el-table-column>
-                <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">
                         <el-row class="rowcenter">
@@ -135,8 +129,8 @@
                             <el-option key="2" label="校外" value="2" />
                         </el-select>
                     </el-form-item>
-                    <el-form-item label="职称" prop="Title">
-                        <el-input v-model.trim="formItem.Title" placeholder="请输入职称" maxlength="20"
+                    <el-form-item label="职务/职称" prop="Title">
+                        <el-input v-model.trim="formItem.Title" placeholder="请输入职务/职称" maxlength="20"
                             autocomplete="off"></el-input>
                     </el-form-item>
                     <!-- <el-form-item label="请选择学校" prop="schoolId">
@@ -169,9 +163,6 @@
                         <el-input v-model.trim="formItem.WorkWechat" placeholder="请输入企业微信号"
                             autocomplete="off"></el-input>
                     </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-input v-model.trim="formItem.WeiXin" placeholder="请输入微信号" autocomplete="off"></el-input>
                     </el-form-item> -->
@@ -507,11 +498,6 @@ export default {
                                 message: '教师状态不能为空',
                                 type: 'error'
                             });
-                        } else if (data == 6) {
-                            this.$message({
-                                message: '邮箱格式不正确',
-                                type: 'error'
-                            });
                         } else if (data == 7) {
                             this.$message({
                                 message: '手机号码格式不正确',
@@ -604,11 +590,6 @@ export default {
                                 message: '教师状态不能为空',
                                 type: 'error'
                             });
-                        } else if (data == 6) {
-                            this.$message({
-                                message: '邮箱格式不正确',
-                                type: 'error'
-                            });
                         } else if (data == 7) {
                             this.$message({
                                 message: '手机号码格式不正确',