zpy

ruoyi-ui/src/router/index.js

@@ -89,6 +89,8 @@ export const constantRoutes = [
       ),
     hidden: true,
   },
+  //教师电子档案
+
   //课程表
   {
     path: "/printLesson",
@@ -211,6 +213,27 @@ export const dynamicRoutes = [
       },
     ],
   },
+  // {
+  //   path: "/electronicArchives/personalInformation",
+  //   component: () =>
+  //     import("@/views/smartSchool/electronicArchives/personalInformation"),
+  //   hidden: true,
+  // },
+  {
+    path: "/",
+    component: Layout,
+    hidden: true,
+    redirect: "noredirect",
+    children: [
+      {
+        path: "electronicArchives/personalInformation",
+        component: () =>
+          import("@/views/smartSchool/electronicArchives/personalInformation"),
+        name: "personalInformation",
+        meta: { title: "教师个人信息汇总", icon: "" },
+      },
+    ],
+  },
   //科目数据
   // {
   //   path: "/subjectManagement/data",

ruoyi-ui/src/views/smartSchool/awardsDisciplinary/schoolAwards/awardEntry/index.vue

@@ -20,8 +20,8 @@
                 </el-date-picker>
             </el-form-item>
             <el-form-item label="主导部门">
-                <Treeselect v-model="queryForm.competentDeptId" :options="deptOptions" :show-count="true" placeholder="请选择"
-                    :defaultExpandLevel=1 style="width: 208px" filterable />
+                <Treeselect v-model="queryForm.competentDeptId" :options="deptOptions" :show-count="true"
+                    placeholder="请选择" :defaultExpandLevel=1 style="width: 208px" filterable />
             </el-form-item>
 
             <el-form-item>
@@ -122,8 +122,8 @@
                     <el-col :span="12">
                         <el-form-item label="主管部门" prop="competentDeptId">
                             <Treeselect v-model="form.competentDeptId" :options="deptOptions" :show-count="true"
-                                placeholder="请选择" :default-expand-level=1 :style="{ width: '100%' }" @select="deptIdAndName"
-                                filterable />
+                                placeholder="请选择" :default-expand-level=1 :style="{ width: '100%' }"
+                                @select="deptIdAndName" filterable />
                         </el-form-item>
                     </el-col>
                 </el-row>
@@ -139,8 +139,8 @@
                     </el-col>
                     <el-col :span="12">
                         <el-form-item label="获奖时间" prop="awardsTime">
-                            <el-date-picker v-model="form.awardsTime" type="date" placeholder="选择" value-format="yyyy-MM-dd"
-                                :style="{ width: '100%' }">
+                            <el-date-picker v-model="form.awardsTime" type="date" placeholder="选择"
+                                value-format="yyyy-MM-dd" :style="{ width: '100%' }">
                             </el-date-picker>
                         </el-form-item>
                     </el-col>
@@ -244,8 +244,8 @@
                     </el-col>
                     <el-col :span="12">
                         <el-form-item label="获奖时间" prop="awardsTime">
-                            <el-date-picker v-model="form.awardsTime" type="date" placeholder="选择" value-format="yyyy-MM-dd"
-                                :style="{ width: '100%' }">
+                            <el-date-picker v-model="form.awardsTime" type="date" placeholder="选择"
+                                value-format="yyyy-MM-dd" :style="{ width: '100%' }">
                             </el-date-picker>
                         </el-form-item>
                     </el-col>

ruoyi-ui/src/views/smartSchool/electronicArchives/assessmentView/index.vue

@@ -11,7 +11,8 @@
                     </el-col>
                     <el-col :span="12">
                         <el-form-item label="学年" prop="schoolYear">
-                            <el-select v-model="queryParams.schoolYear" clearable placeholder="请选择" style="width: 100%;">
+                            <el-select v-model="queryParams.schoolYear" clearable placeholder="请选择"
+                                style="width: 100%;">
                                 <el-option v-for="dict in dict.type.yearda" :key="dict.value" :label="dict.label"
                                     :value="dict.value">
                                 </el-option>
@@ -31,8 +32,8 @@
                     <el-col :span="12">
                         <el-form-item label="学期" prop="semester">
                             <el-select v-model="queryParams.semester" clearable placeholder="请选择" style="width: 100%;">
-                                <el-option v-for="dict in dict.type.semester_jsdzda" :key="dict.value" :label="dict.label"
-                                    :value="dict.value">
+                                <el-option v-for="dict in dict.type.semester_jsdzda" :key="dict.value"
+                                    :label="dict.label" :value="dict.value">
                                 </el-option>
                             </el-select>
                         </el-form-item>
@@ -51,8 +52,8 @@
                     <el-col :span="12">
                         <el-form-item label="学科" prop="sub">
                             <el-select v-model="queryParams.sub" clearable placeholder="请选择" style="width: 100%">
-                                <el-option v-for="dict in dict.type.teaching_subjects" :key="dict.value" :label="dict.label"
-                                    :value="dict.value">
+                                <el-option v-for="dict in dict.type.teaching_subjects" :key="dict.value"
+                                    :label="dict.label" :value="dict.value">
                                 </el-option>
                             </el-select>
                         </el-form-item>
@@ -101,12 +102,11 @@
             </el-col>
             <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
         </el-row>
-        <el-table :data="assessmentList" @selection-change="handleSelectionChange"
+        <el-table border :data="assessmentList" @selection-change="handleSelectionChange" @sort-change="sortChange"
             :default-sort="{ prop: 'schoolYear', order: 'descending' }" :row-style="{ height: '1px' }"
             :cell-style="{ padding: '0px' }" :header-cell-style="{ height: '50px', fontSize: '12px', padding: '0 0' }">
             <el-table-column type="selection" width="30" align="center" />
-            <el-table-column type="index" label="序号" width="30" align="center" sortable fixed="left"
-                show-overflow-tooltip />
+            <el-table-column type="index" label="序号" width="30" align="center" sortable fixed="left" />
             <el-table-column label="学年" align="center" prop="schoolYear" sortable fixed="left" width="80px
             " show-overflow-tooltip />
             <el-table-column label="学期" align="center" prop="semester" sortable fixed="left" width="80px"
@@ -115,13 +115,13 @@
                     <dict-tag :options="dict.type.semester_jsdzda" :value="scope.row.semester" />
                 </template>
             </el-table-column>
-            <el-table-column label="届别" align="center" prop="year" sortable show-overflow-tooltip width="70px" />
+            <el-table-column label="届别" align="center" prop="year" sortable show-overflow-tooltip width="60px" />
             <el-table-column label="年级" align="center" prop="grade" sortable show-overflow-tooltip width="60px">
                 <template slot-scope="scope">
                     <dict-tag :options="dict.type.grade_da" :value="scope.row.grade" />
                 </template>
             </el-table-column>
-            <el-table-column label="班级" align="center" prop="className" sortable show-overflow-tooltip width="70px" />
+            <el-table-column label="班级" align="center" prop="className" sortable show-overflow-tooltip width="60px" />
             <el-table-column label="班级类型" align="center" prop="classType" sortable width="90px" show-overflow-tooltip>
                 <template slot-scope="scope">
                     <span v-if="getSelectedTypes(scope.row.classType).length > 0">
@@ -132,17 +132,17 @@
                     </span>
                 </template>
             </el-table-column>
-            <el-table-column label="姓名" align="center" prop="teacherName" sortable show-overflow-tooltip width="90px" />
-            <el-table-column label="学科" align="center" prop="sub" sortable show-overflow-tooltip width="80px">
+            <el-table-column label="姓名" align="center" prop="teacherName" sortable show-overflow-tooltip width="70px" />
+            <el-table-column label="学科" align="center" prop="sub" sortable show-overflow-tooltip width="70px">
                 <template slot-scope="scope">
                     <dict-tag :options="dict.type.teaching_subjects" :value="scope.row.sub" />
                 </template>
             </el-table-column>
-            <el-table-column label="德育考核成绩" align="center" prop="moralEduCheckAchievement" sortable width="110px"
+            <el-table-column label="德育考核成绩" align="center" prop="moralEduCheckAchievement" sortable width="60px"
                 show-overflow-tooltip />
-            <el-table-column label="智育考核成绩" align="center" prop="intellEduCheckAchievement" sortable width="110px"
+            <el-table-column label="智育考核成绩" align="center" prop="intellEduCheckAchievement" sortable width="60px"
                 show-overflow-tooltip />
-            <el-table-column label="考核结果" align="center" prop="assessmentResults" sortable width="130px">
+            <el-table-column label="考核结果" align="center" prop="assessmentResults" sortable width="80px">
                 <template slot-scope="scope">
                     <dict-tag :options="dict.type.assessment_results" :value="scope.row.assessmentResults" />
                 </template>
@@ -150,7 +150,8 @@
             <!-- <el-table-column label="总考核成绩" align="center" prop="totalCheckAchievement" sortable fixed="right"
                 width="130px" /> -->
             <el-table-column label="备注" align="center" prop="remark" sortable show-overflow-tooltip />
-            <el-table-column label="操作" align="center" class-name="small-padding fixed-width" fixed="right" width="150px">
+            <el-table-column label="操作" align="center" class-name="small-padding fixed-width" fixed="right"
+                width="100px">
                 <template slot-scope="scope">
                     <el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)"
                         v-hasPermi="['system:assessment:edit']">查看</el-button>
@@ -158,8 +159,8 @@
                 </template>
             </el-table-column>
         </el-table>
-        <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize"
-            @pagination="getList" />
+        <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum"
+            :limit.sync="queryParams.pageSize" @pagination="getList" />
 
         <!-- 添加或修改班主任考核对话框 -->
         <el-dialog :title="title" :visible.sync="open" width="800px" append-to-body>
@@ -168,8 +169,8 @@
                     <el-col :span="12">
                         <el-form-item label="学期" prop="semester">
                             <el-select v-model="form.semester" clearable placeholder="请选择" style="width: 100%;">
-                                <el-option v-for="dict in dict.type.semester_jsdzda" :key="dict.value" :label="dict.label"
-                                    :value="dict.value">
+                                <el-option v-for="dict in dict.type.semester_jsdzda" :key="dict.value"
+                                    :label="dict.label" :value="dict.value">
                                 </el-option>
                             </el-select>
                         </el-form-item>
@@ -229,7 +230,8 @@
                     </el-col>
                     <el-col :span="12">
                         <el-form-item label="德育考核成绩" prop="moralEduCheckAchievement">
-                            <el-input v-model="form.moralEduCheckAchievement" type="number" placeholder="请输入" clearable />
+                            <el-input v-model="form.moralEduCheckAchievement" type="number" placeholder="请输入"
+                                clearable />
                         </el-form-item>
                     </el-col>
                 </el-row>
@@ -237,12 +239,14 @@
                 <el-row>
                     <el-col :span="12">
                         <el-form-item label="智育考核成绩" prop="intellEduCheckAchievement">
-                            <el-input v-model="form.intellEduCheckAchievement" type="number" placeholder="请输入" clearable />
+                            <el-input v-model="form.intellEduCheckAchievement" type="number" placeholder="请输入"
+                                clearable />
                         </el-form-item>
                     </el-col>
                     <el-col :span="12">
                         <el-form-item label="考核结果" prop="assessmentResults">
-                            <el-select v-model="form.assessmentResults" clearable placeholder="请选择" style="width: 100%;">
+                            <el-select v-model="form.assessmentResults" clearable placeholder="请选择"
+                                style="width: 100%;">
                                 <el-option v-for="dict in dict.type.assessment_results" :key="dict.value"
                                     :label="dict.label" :value="dict.value">
                                 </el-option>
@@ -267,8 +271,8 @@
                     <el-col :span="12">
                         <el-form-item label="学科" prop="sub">
                             <el-select v-model="form.sub" placeholder="请选择" clearable style="width: 100%">
-                                <el-option v-for="dict in dict.type.teaching_subjects" :key="dict.value" :label="dict.label"
-                                    :value="dict.value">
+                                <el-option v-for="dict in dict.type.teaching_subjects" :key="dict.value"
+                                    :label="dict.label" :value="dict.value">
                                 </el-option>
                             </el-select>
                         </el-form-item>
@@ -339,6 +343,8 @@ export default {
             queryParams: {
                 pageNum: 1,
                 pageSize: 10,
+                orderByColumn: "",
+                isAsc: "asc",
                 semester: null,
                 year: null,
                 schoolYear: null,
@@ -403,6 +409,23 @@ export default {
         this.getList();
     },
     methods: {
+        //排序列
+        sortChange(data) {
+            console.log(data, 'data');
+            const { prop, order } = data
+            //排序列
+            this.queryParams.orderByColumn = prop;
+            //排序顺序ascending或descending
+            // this.queryParams.isAsc = order;
+            if (order == "ascending") {
+                this.queryParams.isAsc = 'asc';
+            } else {
+                this.queryParams.isAsc = 'desc';
+            }
+            //返回第一页
+            this.queryParams.pageNum = 1;
+            this.getList();
+        },
         /** 查询班主任考核列表 */
         getList() {
             this.loading = true;
@@ -618,4 +641,9 @@ export default {
     padding: 0;
 
 }
+
+::v-deep.el-table--border .el-table__cell .cell {
+    padding-left: 0px !important;
+
+}
 </style>
\ No newline at end of file

ruoyi-ui/src/views/smartSchool/electronicArchives/basicInformation/index.vue

 <template>
     <div class="app-container">
         <el-dialog title="查询" :visible.sync="query" width="50%" append-to-body>
-            <el-form ref="queryParams" :model="queryParams" label-width="96px" class="search">
+            <el-form ref="queryParams" :model="queryParams" label-width="170px" class="search">
                 <el-row>
                     <el-col :span="12">
                         <el-form-item label="任教学科" prop="teachingSubject">
                             <el-select v-model="queryParams.teachingSubject" clearable placeholder="请选择"
                                 style="width: 100%">
-                                <el-option v-for="dict in dict.type.teaching_subjects" :key="dict.value" :label="dict.label"
-                                    :value="dict.value">
+                                <el-option v-for="dict in dict.type.teaching_subjects" :key="dict.value"
+                                    :label="dict.label" :value="dict.value">
                                 </el-option>
                             </el-select>
                         </el-form-item>
@@ -42,8 +42,8 @@
                         <el-form-item label="政治面貌" prop="politicalLandscape">
                             <el-select v-model="queryParams.politicalLandscape" clearable placeholder="请选择政治面貌"
                                 style="width: 100%">
-                                <el-option v-for="dict in dict.type.politics_tatusls" :key="dict.value" :label="dict.label"
-                                    :value="dict.value">
+                                <el-option v-for="dict in dict.type.politics_tatusls" :key="dict.value"
+                                    :label="dict.label" :value="dict.value">
                                 </el-option>
                             </el-select>
                         </el-form-item>
@@ -58,21 +58,23 @@
                 </el-row>
                 <el-row>
                     <el-col :span="12">
-                        <el-form-item label="现职称" prop="currentProfessionalTitle">
-                            <el-select v-model="queryParams.currentProfessionalTitle" clearable placeholder="请选择"
+                        <el-form-item label="现具备专技资格" prop="currentProfessionalTitle">
+                            <el-input v-model="queryParams.currentProfessionalTitle" placeholder="请输入现具备专技资格" clearable
+                                @keyup.enter.native="handleQuery" />
+                            <!-- <el-select v-model="queryParams.currentProfessionalTitle" clearable placeholder="请选择"
                                 style="width: 100%">
                                 <el-option v-for="dict in dict.type.current_professional" :key="dict.value"
                                     :label="dict.label" :value="dict.value">
                                 </el-option>
-                            </el-select>
+                            </el-select> -->
                         </el-form-item>
                     </el-col>
                     <el-col :span="12">
                         <el-form-item label="在岗情况" prop="onDutySituation">
                             <el-select v-model="queryParams.onDutySituation" clearable placeholder="请选择"
                                 style="width: 100%">
-                                <el-option v-for="dict in dict.type.duty_situation" :key="dict.value" :label="dict.label"
-                                    :value="dict.value">
+                                <el-option v-for="dict in dict.type.duty_situation" :key="dict.value"
+                                    :label="dict.label" :value="dict.value">
                                 </el-option>
                             </el-select>
                         </el-form-item>
@@ -93,7 +95,8 @@
                     </el-col>
                 </el-row>
             </el-form>
-            <div slot="footer" class="dialog-footer" style="display: flex; justify-content: center; align-items: center">
+            <div slot="footer" class="dialog-footer"
+                style="display: flex; justify-content: center; align-items: center">
                 <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
                 <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
             </div>
@@ -108,8 +111,8 @@
                 </el-button>
             </el-col>
             <el-col :span="1.5">
-                <el-button type="danger" plain icon="el-icon-delete" size="mini" :disabled="single" @click="handleDelete"
-                    v-hasPermi="['system:student:remove']">删除
+                <el-button type="danger" plain icon="el-icon-delete" size="mini" :disabled="single"
+                    @click="handleDelete" v-hasPermi="['system:student:remove']">删除
                 </el-button>
             </el-col>
             <el-col :offset="1" :span="1.5">
@@ -129,48 +132,53 @@
                 </el-upload>
             </el-col>
         </el-row>
-        <el-table :data="informationList" @selection-change="handleSelectionChange"
+        <el-table border :data="informationList" @selection-change="handleSelectionChange" @sort-change="sortChange"
             :default-sort="{ prop: 'toSecondMiddleSchoolTime', order: 'descending' }" :row-style="{ height: '1px' }"
             :cell-style="{ padding: '0px' }" :header-cell-style="{ height: '0px', fontSize: '12px', padding: '0 0' }">
-            <el-table-column type="selection" width="30" align="center" />
+            <el-table-column type="selection" align="center" width="40" />
             <el-table-column type="index" label="序号" width="30" align="center" fixed="left" />
-            <el-table-column label="姓名" align="center" prop="name" width="100" sortable fixed="left"
+            <el-table-column label="姓名" align="center" prop="name" width="65" sortable fixed="left"
                 show-overflow-tooltip />
-            <el-table-column label="性别" width="55" align="center" prop="sex" sortable fixed="left" show-overflow-tooltip>
+            <el-table-column label="性别" width="52" align="center" prop="sex" sortable fixed="left"
+                show-overflow-tooltip>
                 <template slot-scope="scope">
                     <dict-tag :options="dict.type.sys_user_sex" :value="scope.row.sex" />
                 </template>
             </el-table-column>
-            <el-table-column label="年龄" width="55" align="center" prop="age" sortable fixed="left" show-overflow-tooltip />
-            <el-table-column label="档案年龄" align="center" prop="fileAge" sortable />
-            <el-table-column label="政治面貌" align="center" prop="politicalLandscape" sortable show-overflow-tooltip>
+            <el-table-column label="年龄" width="50" align="center" prop="age" fixed="left" show-overflow-tooltip />
+            <el-table-column label="档案年龄" align="center" prop="fileAge" width="85" />
+            <el-table-column label="政治面貌" align="center" width="90" prop="politicalLandscape" sortable
+                show-overflow-tooltip>
                 <template slot-scope="scope">
                     <dict-tag :options="dict.type.politics_tatusls" :value="scope.row.politicalLandscape" />
                 </template>
             </el-table-column>
-            <el-table-column label="档案生日" align="center" prop="fileBirthDate" sortable show-overflow-tooltip>
+            <el-table-column label="档案生日" align="center" prop="fileBirthDate" sortable width="90" show-overflow-tooltip>
                 <template slot-scope="scope">
                     <span>{{ parseTime(scope.row.fileBirthDate, "{y}-{m}-{d}") }}</span>
                 </template>
             </el-table-column>
-            <el-table-column label="到市二中工作时间" width="80" align="center" prop="toSecondMiddleSchoolTime" sortable
+            <el-table-column label="到市二中工作时间" width="85" align="center" prop="toSecondMiddleSchoolTime" sortable
                 show-overflow-tooltip />
-            <el-table-column label="到市二中工作年限" width="70" align="center" prop="toSecondAge" sortable show-overflow-tooltip />
-            <el-table-column label="现职称" align="center" prop="currentHiringProfessionalTitle" sortable
+            <el-table-column label="到市二中工作年限" width="70" align="center" prop="toSecondAge" show-overflow-tooltip />
+            <el-table-column label="现具备专技资格" width="110" align="center" prop="currentHiringProfessionalTitle" sortable
                 show-overflow-tooltip>
-                <template slot-scope="scope">
-                    <dict-tag :options="dict.type.current_professional" :value="scope.row.currentHiringProfessionalTitle" />
-                </template>
+                <!-- <template slot-scope="scope">
+                    <dict-tag :options="dict.type.current_professional"
+                        :value="scope.row.currentHiringProfessionalTitle" />
+                </template> -->
             </el-table-column>
             <el-table-column label="毕业院校" align="center" prop="graduationInstitution3" sortable show-overflow-tooltip />
             <el-table-column label="学历" width="75px" align="center" prop="lastDegree" sortable show-overflow-tooltip />
             <el-table-column label="在岗情况" align="center" prop="onDutySituation" sortable show-overflow-tooltip
-                width="100px">
+                width="80px">
                 <template slot-scope="scope">
                     <dict-tag :options="dict.type.duty_situation" :value="scope.row.onDutySituation" />
                 </template>
             </el-table-column>
-            <el-table-column label="操作" align="center" fixed="right" class-name="small-padding fixed-width" width="120px">
+            <!-- <el-table-column label="备注" align="center" prop="remark" sortable show-overflow-tooltip /> -->
+            <el-table-column label="操作" align="center" fixed="right" class-name="small-padding fixed-width"
+                width="108px">
                 <template slot-scope="scope">
                     <el-button v-hasPermi="['system:student:edit']" size="mini" type="text"
                         @click="handleUpdate(scope.row)">修改</el-button>
@@ -182,15 +190,16 @@
             </el-table-column>
         </el-table>
 
-        <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize"
-            @pagination="getList" />
+        <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum"
+            :limit.sync="queryParams.pageSize" @pagination="getList" />
         <!-- 导入对话框 -->
         <el-dialog :title="title" :visible.sync="uploadOpen" width="520px" append-to-body inline @close="cancel">
             <el-form ref="uploadForm" :model="uploadForm" :rules="rules" label-width="70px">
                 <el-form-item prop="dataUrl">
                     <el-upload ref="upload" :limit="1" accept=".xlsx, .xls" :headers="upload.headers"
                         :action="upload.url + '?updateSupport=' + upload.updateSupport" :disabled="upload.isUploading"
-                        :on-progress="handleFileUploadProgress" :on-success="handleFileSuccess" :auto-upload="false" drag>
+                        :on-progress="handleFileUploadProgress" :on-success="handleFileSuccess" :auto-upload="false"
+                        drag>
                         <i class="el-icon-upload"></i>
                         <div class="el-upload__text">
                             将文件拖到此处，或<em>点击上传</em>
@@ -227,14 +236,17 @@
                         </el-col>
                         <el-col :span="12" class="custom-margin">
                             <el-form-item label="身份证号" prop="idCard">
-                                <el-input v-model="form.idCard" @blur="handleIdCardBlur" maxlength="18" placeholder="请输入"
-                                    clearable style="width: 190px;"></el-input>
+                                <el-input v-model="form.idCard" @blur="handleIdCardBlur" maxlength="18"
+                                    placeholder="请输入" clearable style="width: 190px;"></el-input>
                             </el-form-item>
                         </el-col>
                         <el-col :span="12" class="custom-margin">
                             <el-form-item label="档案出生日期" prop="fileBirthDate">
-                                <el-date-picker v-model="form.fileBirthDate" placeholder="选择日期" style="width: 100%;"
-                                    clearable type="month" value-format="yyyy-MM"></el-date-picker>
+                                <!-- <el-date-picker v-model="form.fileBirthDate" placeholder="选择日期" style="width: 100%;"
+                                    clearable type="month" value-format="yyyy-MM"></el-date-picker> -->
+                                <el-date-picker clearable value-format="yyyy-MM-dd" v-model="form.fileBirthDate"
+                                    type="date" style="width: 100%;" placeholder="选择日期">
+                                </el-date-picker>
                             </el-form-item>
                         </el-col>
                         <el-col :span="12" class="custom-margin">
@@ -273,25 +285,28 @@
                         </el-col>
                         <el-col :span="12" class="custom-margin">
                             <el-form-item label="任教学科" prop="teachingSubject">
-                                <el-select v-model="form.teachingSubject" style="width: 190px;" placeholder="请选择" clearable>
+                                <el-select v-model="form.teachingSubject" style="width: 190px;" placeholder="请选择"
+                                    clearable>
                                     <el-option v-for="dict in dict.type.teaching_subjects" :key="dict.value"
                                         :label="dict.label" :value="dict.value">
                                     </el-option>
                                 </el-select>
                             </el-form-item>
-                        </el-col><el-col :span="12" class="custom-margin">
-                            <el-form-item label="现职称" prop="currentProfessionalTitle">
-                                <el-select v-model="form.currentProfessionalTitle" style="width: 100%" placeholder="请选择"
+                        </el-col>
+                        <el-col :span="12" class="custom-margin">
+                            <el-form-item label="现具备专技资格" prop="currentProfessionalTitle">
+                                <el-input v-model="form.currentProfessionalTitle" placeholder="请输入现具备专技资格" clearable />
+                                <!-- <el-select v-model="form.currentProfessionalTitle" style="width: 100%" placeholder="请选择"
                                     clearable>
                                     <el-option v-for="dict in dict.type.current_professional" :key="dict.value"
                                         :label="dict.label" :value="dict.value">
                                     </el-option>
-                                </el-select>
+                                </el-select> -->
                             </el-form-item>
                         </el-col><el-col :span="12" class="custom-margin">
-                            <el-form-item label="现职称取得资格时间" prop="currentProfessionalTitleTime">
-                                <el-date-picker clearable v-model="form.currentProfessionalTitleTime" type="date"
-                                    value-format="yyyy-MM-dd" placeholder="请选择" style="width: 190px;">
+                            <el-form-item label="现具备专技资格时间" prop="currentProfessionalTitleTime">
+                                <el-date-picker clearable v-model="form.currentProfessionalTitleTime" type="month"
+                                    value-format="yyyy-MM" placeholder="请选择" style="width: 190px;">
                                 </el-date-picker>
                             </el-form-item>
                         </el-col>
@@ -318,19 +333,21 @@
                 </el-row>
                 <el-row :gutter="6" type="flex" justify="space-between">
                     <el-col :span="8" class="custom-margin">
-                        <el-form-item label="现聘职称" prop="currentHiringProfessionalTitle">
-                            <el-select clearable v-model="form.currentHiringProfessionalTitle" style="width: 100%"
+                        <el-form-item label="现聘专技资格" prop="currentHiringProfessionalTitle">
+                            <el-input v-model="form.currentHiringProfessionalTitle" placeholder="请输入"
+                                style="width: 100%;" />
+                            <!-- <el-select clearable v-model="form.currentHiringProfessionalTitle" style="width: 100%"
                                 placeholder="请选择">
                                 <el-option v-for="dict in dict.type.current_professional" :key="dict.value"
                                     :label="dict.label" :value="dict.value">
                                 </el-option>
-                            </el-select>
+                            </el-select> -->
                         </el-form-item>
                     </el-col>
                     <el-col :span="8" class="custom-margin">
-                        <el-form-item label="现职称聘任时间" prop="currentHiringProfessionalTitleTime">
-                            <el-date-picker clearable v-model="form.currentHiringProfessionalTitleTime" type="date"
-                                value-format="yyyy-MM-dd" placeholder="请选择" style="width: 190px;">
+                        <el-form-item label="现聘专技资格时间" prop="currentHiringProfessionalTitleTime">
+                            <el-date-picker clearable v-model="form.currentHiringProfessionalTitleTime" type="month"
+                                value-format="yyyy-MM" placeholder="请选择" style="width: 190px;">
                             </el-date-picker>
                         </el-form-item>
                     </el-col>
@@ -342,8 +359,8 @@
                     <el-col :span="8" class="custom-margin">
                         <el-form-item label="现聘岗位" prop="currentPosition">
                             <el-select v-model="form.currentPosition" style="width:100%;" placeholder="请选择" clearable>
-                                <el-option v-for="dict in dict.type.current_position" :key="dict.value" :label="dict.label"
-                                    :value="dict.value">
+                                <el-option v-for="dict in dict.type.current_position" :key="dict.value"
+                                    :label="dict.label" :value="dict.value">
                                 </el-option>
                             </el-select>
                         </el-form-item>
@@ -359,8 +376,8 @@
                     </el-col>
                     <el-col :span="8" class="custom-margin">
                         <el-form-item label="现岗位等级聘任时间" prop="currentJobLevelAppointmentTime">
-                            <el-date-picker clearable v-model="form.currentJobLevelAppointmentTime" type="date"
-                                value-format="yyyy-MM-dd" placeholder="请选择" :style="{ width: '100%' }">
+                            <el-date-picker clearable v-model="form.currentJobLevelAppointmentTime" type="month"
+                                value-format="yyyy-MM" placeholder="请选择" :style="{ width: '100%' }">
                             </el-date-picker>
                         </el-form-item>
                     </el-col>
@@ -417,8 +434,8 @@
                     <el-col :span="8" class="custom-margin">
                         <el-form-item label="在岗情况" prop="onDutySituation">
                             <el-select v-model="form.onDutySituation" clearable style="width: 190px;" placeholder="请选择">
-                                <el-option v-for="dict in dict.type.duty_situation" :key="dict.value" :label="dict.label"
-                                    :value="dict.value">
+                                <el-option v-for="dict in dict.type.duty_situation" :key="dict.value"
+                                    :label="dict.label" :value="dict.value">
                                 </el-option>
                             </el-select>
                         </el-form-item>
@@ -426,8 +443,8 @@
                     <el-col :span="8" class="custom-margin">
                         <el-form-item label="在编情况" prop="currentSituation">
                             <el-select v-model="form.currentSituation" clearable style="width: 100%" placeholder="请选择">
-                                <el-option v-for="dict in dict.type.current_situation" :key="dict.value" :label="dict.label"
-                                    :value="dict.value">
+                                <el-option v-for="dict in dict.type.current_situation" :key="dict.value"
+                                    :label="dict.label" :value="dict.value">
                                 </el-option>
                             </el-select>
                         </el-form-item>
@@ -447,8 +464,8 @@
                     </el-col>
                     <el-col :span="8" class="custom-margin">
                         <el-form-item label="毕业时间1" prop="graduationTime1">
-                            <el-date-picker clearable v-model="form.graduationTime1" type="month" value-format="yyyy-MM"
-                                placeholder="请选择" :style="{ width: '100%' }">
+                            <el-date-picker clearable v-model="form.graduationTime1" type="date"
+                                value-format="yyyy-MM-dd" placeholder="请选择" :style="{ width: '100%' }">
                             </el-date-picker>
                         </el-form-item>
                     </el-col>
@@ -467,8 +484,8 @@
                     </el-col>
                     <el-col :span="8" class="custom-margin">
                         <el-form-item label="毕业时间2" prop="graduationTime2">
-                            <el-date-picker clearable v-model="form.graduationTime2" type="month" value-format="yyyy-MM"
-                                placeholder="请选择" :style="{ width: '100%' }">
+                            <el-date-picker clearable v-model="form.graduationTime2" type="date"
+                                value-format="yyyy-MM-dd" placeholder="请选择" :style="{ width: '100%' }">
                             </el-date-picker>
                         </el-form-item>
                     </el-col>
@@ -487,8 +504,8 @@
                     </el-col>
                     <el-col :span="8" class="custom-margin">
                         <el-form-item label="毕业时间3" prop="graduationTime3">
-                            <el-date-picker clearable v-model="form.graduationTime3" type="month" value-format="yyyy-MM"
-                                placeholder="请选择" :style="{ width: '100%' }">
+                            <el-date-picker clearable v-model="form.graduationTime3" type="date"
+                                value-format="yyyy-MM-dd" placeholder="请选择" :style="{ width: '100%' }">
                             </el-date-picker>
                         </el-form-item>
                     </el-col>
@@ -547,8 +564,8 @@
                         </el-col>
                         <el-col :span="12" class="custom-margin">
                             <el-form-item label="身份证号" prop="idCard">
-                                <el-input v-model="form.idCard" @blur="handleIdCardBlur" maxlength="18" placeholder="请输入"
-                                    clearable style="width: 190px;"></el-input>
+                                <el-input v-model="form.idCard" @blur="handleIdCardBlur" maxlength="18"
+                                    placeholder="请输入" clearable style="width: 190px;"></el-input>
                             </el-form-item>
                         </el-col>
                         <el-col :span="12" class="custom-margin">
@@ -559,16 +576,16 @@
                         <el-col :span="12" class="custom-margin">
                             <el-form-item label="性别" prop="sex">
                                 <el-select v-model="form.sex" placeholder="请选择" style="width: 190px;">
-                                    <el-option v-for="dict in dict.type.sys_user_sex" :key="dict.value" :label="dict.label"
-                                        :value="dict.value"></el-option>
+                                    <el-option v-for="dict in dict.type.sys_user_sex" :key="dict.value"
+                                        :label="dict.label" :value="dict.value"></el-option>
                                 </el-select>
                             </el-form-item>
                         </el-col>
 
                         <el-col :span="12" class="custom-margin">
                             <el-form-item label="档案出生日期" prop="fileBirthDate">
-                                <el-date-picker v-model="form.fileBirthDate" placeholder="请选择" style="width: 100%"
-                                    type="month" value-format="yyyy-MM"></el-date-picker>
+                                <el-date-picker clearable value-format="yyyy-MM-dd" v-model="form.fileBirthDate"
+                                    type="date" style="width: 100%;" placeholder="选择日期"></el-date-picker>
                             </el-form-item>
                         </el-col>
                         <el-col :span="12" class="custom-margin">
@@ -639,44 +656,48 @@
                 </el-row>
                 <el-row :gutter="6" type="flex" justify="space-between">
                     <el-col :span="8" class="custom-margin">
-                        <el-form-item label="现职称" prop="currentProfessionalTitle">
-                            <el-select v-model="form.currentProfessionalTitle" style="width: 100%" placeholder="请选择">
+                        <el-form-item label="现具备专技资格" prop="currentProfessionalTitle">
+                            <el-input v-model="form.currentProfessionalTitle" placeholder="请输入" style="width: 100%;" />
+                            <!-- <el-select v-model="form.currentProfessionalTitle" style="width: 100%" placeholder="请选择">
                                 <el-option v-for="dict in dict.type.current_professional" :key="dict.value"
                                     :label="dict.label" :value="dict.value">
                                 </el-option>
-                            </el-select>
+                            </el-select> -->
                         </el-form-item>
                     </el-col>
                     <el-col :span="8" class="custom-margin">
-                        <el-form-item label="现职称取得资格时间" prop="currentProfessionalTitleTime">
-                            <el-date-picker clearable v-model="form.currentProfessionalTitleTime" type="date"
-                                value-format="yyyy-MM-dd" placeholder="请选择" style="width: 190px;">
+                        <el-form-item label="现具备专技资格时间" prop="currentProfessionalTitleTime">
+                            <el-date-picker clearable v-model="form.currentProfessionalTitleTime" type="month"
+                                value-format="yyyy-MM" placeholder="请选择" style="width: 190px;">
                             </el-date-picker>
                         </el-form-item>
                     </el-col>
                     <el-col :span="8" class="custom-margin">
-                        <el-form-item label="现聘职称" prop="currentHiringProfessionalTitle">
-                            <el-select v-model="form.currentHiringProfessionalTitle" style="width: 100%" placeholder="请选择">
+                        <el-form-item label="现聘专技资格" prop="currentHiringProfessionalTitle">
+                            <el-input v-model="form.currentHiringProfessionalTitle" placeholder="请输入"
+                                style="width: 100%;" />
+                            <!-- <el-select v-model="form.currentHiringProfessionalTitle" style="width: 100%"
+                                placeholder="请选择">
                                 <el-option v-for="dict in dict.type.current_professional" :key="dict.value"
                                     :label="dict.label" :value="dict.value">
                                 </el-option>
-                            </el-select>
+                            </el-select> -->
                         </el-form-item>
                     </el-col>
                 </el-row>
                 <el-row :gutter="6" type="flex" justify="space-between">
                     <el-col :span="8" class="custom-margin">
-                        <el-form-item label="现职称聘任时间" prop="currentHiringProfessionalTitleTime">
-                            <el-date-picker clearable v-model="form.currentHiringProfessionalTitleTime" type="date"
-                                value-format="yyyy-MM-dd" placeholder="请选择" :style="{ width: '100%' }">
+                        <el-form-item label="现聘专技资格时间" prop="currentHiringProfessionalTitleTime">
+                            <el-date-picker clearable v-model="form.currentHiringProfessionalTitleTime" type="month"
+                                value-format="yyyy-MM" placeholder="请选择" style="width: 190px;">
                             </el-date-picker>
                         </el-form-item>
                     </el-col>
                     <el-col :span="8" class="custom-margin">
                         <el-form-item label="现聘岗位" prop="currentPosition">
                             <el-select v-model="form.currentPosition" style="width: 190px;" placeholder="请选择">
-                                <el-option v-for="dict in dict.type.current_position" :key="dict.value" :label="dict.label"
-                                    :value="dict.value">
+                                <el-option v-for="dict in dict.type.current_position" :key="dict.value"
+                                    :label="dict.label" :value="dict.value">
                                 </el-option>
                             </el-select>
                         </el-form-item>
@@ -694,8 +715,8 @@
                 <el-row :gutter="6" type="flex" justify="space-between">
                     <el-col :span="8" class="custom-margin">
                         <el-form-item label="现岗位等级聘任时间" prop="currentJobLevelAppointmentTime">
-                            <el-date-picker clearable v-model="form.currentJobLevelAppointmentTime" type="date"
-                                value-format="yyyy-MM-dd" placeholder="请选择" :style="{ width: '100%' }">
+                            <el-date-picker clearable v-model="form.currentJobLevelAppointmentTime" type="month"
+                                value-format="yyyy-MM" placeholder="请选择" :style="{ width: '100%' }">
                             </el-date-picker>
                         </el-form-item>
                     </el-col>
@@ -762,8 +783,8 @@
                     <el-col :span="8" class="custom-margin">
                         <el-form-item label="在岗情况" prop="onDutySituation">
                             <el-select v-model="form.onDutySituation" style="width: 190px;" placeholder="请选择">
-                                <el-option v-for="dict in dict.type.duty_situation" :key="dict.value" :label="dict.label"
-                                    :value="dict.value">
+                                <el-option v-for="dict in dict.type.duty_situation" :key="dict.value"
+                                    :label="dict.label" :value="dict.value">
                                 </el-option>
                             </el-select>
                         </el-form-item>
@@ -771,8 +792,8 @@
                     <el-col :span="8" class="custom-margin">
                         <el-form-item label="在编情况" prop="currentSituation">
                             <el-select v-model="form.currentSituation" style="width: 100%" placeholder="请选择">
-                                <el-option v-for="dict in dict.type.current_situation" :key="dict.value" :label="dict.label"
-                                    :value="dict.value">
+                                <el-option v-for="dict in dict.type.current_situation" :key="dict.value"
+                                    :label="dict.label" :value="dict.value">
                                 </el-option>
                             </el-select>
                         </el-form-item>
@@ -791,7 +812,9 @@
                     </el-col>
                     <el-col :span="8" class="custom-margin">
                         <el-form-item label="毕业时间1" prop="graduationTime1">
-                            <el-input v-model="form.graduationTime1" placeholder="请输入" />
+                            <el-date-picker clearable v-model="form.graduationTime1" type="date"
+                                value-format="yyyy-MM-dd" placeholder="请选择" :style="{ width: '100%' }">
+                            </el-date-picker>
                         </el-form-item>
                     </el-col>
                 </el-row>
@@ -808,7 +831,9 @@
                     </el-col>
                     <el-col :span="8" class="custom-margin">
                         <el-form-item label="毕业时间2" prop="graduationTime2">
-                            <el-input v-model="form.graduationTime2" placeholder="请输入" />
+                            <el-date-picker clearable v-model="form.graduationTime2" type="date"
+                                value-format="yyyy-MM-dd" placeholder="请选择" :style="{ width: '100%' }">
+                            </el-date-picker>
                         </el-form-item>
                     </el-col>
                 </el-row>
@@ -825,7 +850,9 @@
                     </el-col>
                     <el-col :span="8" class="custom-margin">
                         <el-form-item label="毕业时间3" prop="graduationTime3">
-                            <el-input v-model="form.graduationTime3" placeholder="请输入" />
+                            <el-date-picker clearable v-model="form.graduationTime3" type="date"
+                                value-format="yyyy-MM-dd" placeholder="请选择" :style="{ width: '100%' }">
+                            </el-date-picker>
                         </el-form-item>
                     </el-col>
                 </el-row>
@@ -958,6 +985,8 @@ export default {
             queryParams: {
                 pageNum: 1,
                 pageSize: 10,
+                orderByColumn: "",
+                isAsc: "asc",
                 teachingSubject: "",
                 name: "",
                 sex: "",
@@ -1018,6 +1047,23 @@ export default {
         this.getList();
     },
     methods: {
+        //排序列
+        sortChange(data) {
+            console.log(data, 'data');
+            const { prop, order } = data
+            //排序列
+            this.queryParams.orderByColumn = prop;
+            //排序顺序ascending或descending
+            // this.queryParams.isAsc = order;
+            if (order == "ascending") {
+                this.queryParams.isAsc = 'asc';
+            } else {
+                this.queryParams.isAsc = 'desc';
+            }
+            //返回第一页
+            this.queryParams.pageNum = 1;
+            this.getList();
+        },
         //身份证校验
         handleIdCardBlur() {
             const idCard = this.form.idCard;
@@ -1515,11 +1561,13 @@ export default {
 }
 
 ::v-deep .el-table th.el-table__cell>.cell {
-    padding: 0;
+    padding: 0 !important;
 
 }
 
-// ::v-deep.el-table .caret-wrapper {
-// height: 20px !important;
-// }
+
+::v-deep.el-table--border .el-table__cell .cell {
+    padding-left: 0px !important;
+
+}
 </style>

ruoyi-ui/src/views/smartSchool/electronicArchives/electronicRecords/index.vue

@@ -32,7 +32,8 @@
                     </el-select>
                 </el-form-item>
                 <el-form-item label="姓名" prop="name">
-                    <el-input v-model="queryParams.name" placeholder="请输入姓名" clearable @keyup.enter.native="handleQuery" />
+                    <el-input v-model="queryParams.name" placeholder="请输入姓名" clearable
+                        @keyup.enter.native="handleQuery" />
                 </el-form-item>
                 <el-form-item label="开始时间" prop="startTime">
                     <el-date-picker clearable v-model="queryParams.startTime" type="date" value-format="yyyy-MM-dd"
@@ -67,8 +68,8 @@
                     v-hasPermi="['school:youthTeacher:edit']">修改</el-button>
             </el-col>
             <el-col :span="1.5">
-                <el-button type="danger" plain icon="el-icon-delete" size="mini" :disabled="multiple" @click="handleDelete"
-                    v-hasPermi="['school:youthTeacher:remove']">删除</el-button>
+                <el-button type="danger" plain icon="el-icon-delete" size="mini" :disabled="multiple"
+                    @click="handleDelete" v-hasPermi="['school:youthTeacher:remove']">删除</el-button>
             </el-col>
             <el-col :span="1.5">
                 <el-button type="warning" plain icon="el-icon-download" size="mini" @click="handleExport"
@@ -81,7 +82,7 @@
             <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
         </el-row>
 
-        <el-table v-loading="loading" :data="youthTeacherList" @selection-change="handleSelectionChange"
+        <el-table border v-loading="loading" :data="youthTeacherList" @selection-change="handleSelectionChange"
             :row-style="{ height: '1px' }" :cell-style="{ padding: '0px' }"
             :header-cell-style="{ height: '0px', fontSize: '12px', padding: '0 0' }">
             <el-table-column type="selection" width="55" align="center" />
@@ -108,8 +109,8 @@
             </el-table-column>
         </el-table>
 
-        <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize"
-            @pagination="getList" />
+        <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum"
+            :limit.sync="queryParams.pageSize" @pagination="getList" />
 
         <!-- 添加或修改青年教师成长档案对话框 -->
         <el-dialog :title="title" :visible.sync="open" width="900px" append-to-body>
@@ -127,8 +128,8 @@
                     <el-col :span="12">
                         <el-form-item label="学期" prop="semester">
                             <el-select v-model="form.semester" clearable placeholder="请选择" style="width: 100%;">
-                                <el-option v-for="dict in dict.type.semester_jsdzda" :key="dict.value" :label="dict.label"
-                                    :value="dict.value">
+                                <el-option v-for="dict in dict.type.semester_jsdzda" :key="dict.value"
+                                    :label="dict.label" :value="dict.value">
                                 </el-option>
                             </el-select>
                         </el-form-item>
@@ -158,8 +159,8 @@
                     <el-col :span="12">
                         <el-form-item label="学科" prop="sub">
                             <el-select v-model="form.sub" clearable placeholder="请选择" style="width: 100%">
-                                <el-option v-for="dict in dict.type.teaching_subjects" :key="dict.value" :label="dict.label"
-                                    :value="dict.value">
+                                <el-option v-for="dict in dict.type.teaching_subjects" :key="dict.value"
+                                    :label="dict.label" :value="dict.value">
                                 </el-option>
                             </el-select>
                         </el-form-item>
@@ -198,7 +199,7 @@
                 <el-row>
                     <el-col :span="12">
                         <el-form-item label="研做高考题情况" prop="situation">
-                            <el-input  v-model="form.situation" placeholder="请输入研做高考题情况" />
+                            <el-input v-model="form.situation" placeholder="请输入研做高考题情况" />
                         </el-form-item>
                     </el-col>
 
@@ -233,8 +234,8 @@
                     <el-col :span="12">
                         <el-form-item label="学期" prop="semester">
                             <el-select v-model="form.semester" clearable placeholder="请选择" style="width: 100%;">
-                                <el-option v-for="dict in dict.type.semester_jsdzda" :key="dict.value" :label="dict.label"
-                                    :value="dict.value">
+                                <el-option v-for="dict in dict.type.semester_jsdzda" :key="dict.value"
+                                    :label="dict.label" :value="dict.value">
                                 </el-option>
                             </el-select>
                         </el-form-item>
@@ -264,8 +265,8 @@
                     <el-col :span="12">
                         <el-form-item label="学科" prop="sub">
                             <el-select v-model="form.sub" clearable placeholder="请选择" style="width: 100%">
-                                <el-option v-for="dict in dict.type.teaching_subjects" :key="dict.value" :label="dict.label"
-                                    :value="dict.value">
+                                <el-option v-for="dict in dict.type.teaching_subjects" :key="dict.value"
+                                    :label="dict.label" :value="dict.value">
                                 </el-option>
                             </el-select>
                         </el-form-item>
@@ -304,7 +305,7 @@
                 <el-row>
                     <el-col :span="12">
                         <el-form-item label="研做高考题情况" prop="situation">
-                            <el-input  v-model="form.situation" placeholder="请输入研做高考题情况" />
+                            <el-input v-model="form.situation" placeholder="请输入研做高考题情况" />
                         </el-form-item>
                     </el-col>
 
@@ -313,7 +314,8 @@
                     <el-col :span="24">
                         <el-form-item label="优质课比赛:">
                             <li class="el-upload-list__item ele-upload-list__item-content">
-                                <el-link :href="`${baseUrl}${form.classCompetitionUrl}`" :underline="false" target="_blank">
+                                <el-link :href="`${baseUrl}${form.classCompetitionUrl}`" :underline="false"
+                                    target="_blank">
                                     <span class="el-icon-document"> {{ form.classCompetitionName }} </span>
                                 </el-link>
                             </li>
@@ -332,7 +334,8 @@
                 <el-form-item prop="dataUrl">
                     <el-upload ref="upload" :limit="1" accept=".xlsx, .xls" :headers="upload.headers"
                         :action="upload.url + '?updateSupport=' + upload.updateSupport" :disabled="upload.isUploading"
-                        :on-progress="handleFileUploadProgress" :on-success="handleFileSuccess" :auto-upload="false" drag>
+                        :on-progress="handleFileUploadProgress" :on-success="handleFileSuccess" :auto-upload="false"
+                        drag>
                         <i class="el-icon-upload"></i>
                         <div class="el-upload__text">
                             将文件拖到此处，或<em>点击上传</em>
@@ -722,4 +725,14 @@ export default {
 .search ::v-deep .el-form-item__content {
     width: 200px
 }
+
+::v-deep.el-table--border .el-table__cell .cell {
+    padding-left: 0px !important;
+
+}
+
+::v-deep .el-table-column--selection .cell {
+    padding-left: 0px !important;
+    /* padding-right: 14px; */
+}
 </style>
\ No newline at end of file

ruoyi-ui/src/views/smartSchool/electronicArchives/examinationScore/index.vue

@@ -96,13 +96,13 @@
             <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
         </el-row>
 
-        <el-table :row-style="{ height: '1px' }" :cell-style="{ padding: '0px' }"
+        <el-table border :row-style="{ height: '1px' }" :cell-style="{ padding: '0px' }" @sort-change="sortChange"
             :header-cell-style="{ height: '50px', fontSize: '12px', padding: '0 0' }" :data="achievementList"
             @selection-change="handleSelectionChange" :default-sort="{ prop: 'year', order: 'descending' }">
             <el-table-column type="selection" width="30" align="center" sortable />
             <el-table-column type="index" label="序号" width="30" align="center" sortable />
-            <el-table-column label="届别" align="center" prop="year" sortable width="60" show-overflow-tooltip />
-            <el-table-column label="学科" align="center" prop="sub" sortable width="60" show-overflow-tooltip>
+            <el-table-column label="届别" align="center" prop="year" sortable width="55" show-overflow-tooltip />
+            <el-table-column label="学科" align="center" prop="sub" sortable width="55" show-overflow-tooltip>
                 <template slot-scope="scope">
                     <dict-tag :options="dict.type.teaching_subjects" :value="scope.row.sub" />
                 </template>
@@ -120,24 +120,24 @@
                     </span>
                 </template> -->
             </el-table-column>
-            <el-table-column label="高考评优" align="center" prop="gkAppraising" sortable width="110" show-overflow-tooltip>
+            <el-table-column label="高考评优" align="center" prop="gkAppraising" sortable width="90" show-overflow-tooltip>
                 <template slot-scope="scope">
                     <dict-tag :options="dict.type.gk_appraising" :value="scope.row.gkAppraising" />
                 </template>
             </el-table-column>
             <el-table-column label="尖子生培养" align="center" prop="topStudentsCulture" sortable width="120"
                 show-overflow-tooltip />
-            <el-table-column label="增量情况" align="center" prop="incrementSituation" sortable width="120"
+            <el-table-column label="增量情况" align="center" prop="incrementSituation" sortable width="75"
                 show-overflow-tooltip />
-            <el-table-column label="有效数情况" align="center" prop="effectiveNumSituation" sortable width="120"
+            <el-table-column label="有效数情况" align="center" prop="effectiveNumSituation" sortable width="100"
                 show-overflow-tooltip />
             <el-table-column label="其他情况" align="center" prop="other" sortable show-overflow-tooltip />
-            <el-table-column label="审核状态" align="center" prop="auditState" sortable width="90" fixed="right">
+            <el-table-column label="审核状态" align="center" prop="auditState" sortable width="75" fixed="right">
                 <template slot-scope="scope">
                     <dict-tag :options="dict.type.audit_states" :value="scope.row.auditState" />
                 </template>
             </el-table-column>
-            <el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="150" fixed="right">
+            <el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="100" fixed="right">
                 <template slot-scope="scope">
                     <el-button size="mini" type="text" @click="handleUpdate(scope.row)"
                         v-hasPermi="['system:honors:edit']"
@@ -435,6 +435,8 @@ export default {
             queryParams: {
                 pageNum: 1,
                 pageSize: 10,
+                orderByColumn: "",
+                isAsc: "asc",
                 sub: null,
                 teacherName: null,
                 year: null,
@@ -482,6 +484,23 @@ export default {
         this.getList();
     },
     methods: {
+        //排序列
+        sortChange(data) {
+            console.log(data, 'data');
+            const { prop, order } = data
+            //排序列
+            this.queryParams.orderByColumn = prop;
+            //排序顺序ascending或descending
+            // this.queryParams.isAsc = order;
+            if (order == "ascending") {
+                this.queryParams.isAsc = 'asc';
+            } else {
+                this.queryParams.isAsc = 'desc';
+            }
+            //返回第一页
+            this.queryParams.pageNum = 1;
+            this.getList();
+        },
         //下载模版
         importTemplate() {
             this.download(
@@ -784,4 +803,9 @@ export default {
     padding: 0;
 
 }
+
+::v-deep.el-table--border .el-table__cell .cell {
+    padding-left: 0px !important;
+
+}
 </style>

ruoyi-ui/src/views/smartSchool/electronicArchives/personalInformation/index.vue

@@ -153,7 +153,7 @@
                                     </el-col>
                                     <el-col :span="4" class="border_right border-bottom table_cell background">
                                         <el-form-item prop="currentProfessionalTitle">
-                                            <span>现职称</span>
+                                            <span>现具备专技资格</span>
                                         </el-form-item>
                                     </el-col>
                                     <el-col :span="4" class="border_right border-bottom table_cell">
@@ -168,7 +168,7 @@
                                 <el-col :span="24">
                                     <el-col :span="4" class="border_right border-bottom table_cell background">
                                         <el-form-item prop="currentProfessionalTitleTime">
-                                            <span>现职称取得资格时间</span>
+                                            <span>现具备专技资格时间</span>
                                         </el-form-item></el-col>
                                     <el-col :span="4" class="border_right border-bottom table_cell">
                                         <el-form-item prop="currentProfessionalTitleTime">
@@ -177,7 +177,7 @@
                                     </el-col>
                                     <el-col :span="4" class="border_right border-bottom table_cell background">
                                         <el-form-item prop="currentHiringProfessionalTitle">
-                                            <span>现聘职称</span>
+                                            <span>现聘专技资格</span>
                                         </el-form-item>
                                     </el-col>
                                     <el-col :span="4" class="border_right border-bottom table_cell">
@@ -187,7 +187,7 @@
                                     </el-col>
                                     <el-col :span="4" class="border_right border-bottom table_cell background">
                                         <el-form-item prop="currentHiringProfessionalTitleTime">
-                                            <span>现聘任职时间</span>
+                                            <span>现聘专技资格时间</span>
                                         </el-form-item>
                                     </el-col>
                                     <el-col :span="4" class="border_right border-bottom table_cell">
@@ -524,7 +524,7 @@
         <div style="border: 1px solid #f3f3f3;border-radius: 13px 13px 0 0 ; margin:  20px 0;">
             <div class="card_title">工作量信息</div>
             <div style="margin: 3px 10px 15px;">
-                <el-table :data="schoolAworkload" :row-style="{ height: '0' }" :cell-style="{ padding: '3px' }">
+                <el-table border :data="schoolAworkload" :row-style="{ height: '0' }" :cell-style="{ padding: '3px' }">
                     <el-table-column label="学年" align="center" prop="schoolYear" width="120px" fixed="left"
                         show-overflow-tooltip />
                     <el-table-column label="学期" align="center" prop="semester" fixed="left" show-overflow-tooltip>
@@ -544,7 +544,8 @@
                             <dict-tag :options="dict.type.teaching_subjects" :value="scope.row.sub" />
                         </template>
                     </el-table-column>
-                    <el-table-column label="聘任岗位" align="center" prop="appointmentPost" width="120px" show-overflow-tooltip>
+                    <el-table-column label="聘任岗位" align="center" prop="appointmentPost" width="120px"
+                        show-overflow-tooltip>
                         <template slot-scope="scope">
                             <dict-tag :options="dict.type.appointment_positions" :value="scope.row.appointmentPost" />
                         </template>
@@ -554,7 +555,8 @@
                     <el-table-column label="聘任情况" align="center" prop="appointmentSituation" width="120px"
                         show-overflow-tooltip>
                         <template slot-scope="scope">
-                            <dict-tag :options="dict.type.appointment_situation" :value="scope.row.appointmentSituation" />
+                            <dict-tag :options="dict.type.appointment_situation"
+                                :value="scope.row.appointmentSituation" />
                         </template>
                     </el-table-column>
                     <el-table-column label="班级" align="center" prop="className" show-overflow-tooltip />
@@ -577,7 +579,7 @@
         <div style="border: 1px solid #f3f3f3;border-radius: 13px 13px 0 0 ; margin:  20px 0;">
             <div class="card_title">班主任考核</div>
             <div style="margin: 3px 10px 15px;">
-                <el-table :data="schoolAclassTeacherAssessments" :row-style="{ height: '0' }"
+                <el-table border :data="schoolAclassTeacherAssessments" :row-style="{ height: '0' }"
                     :cell-style="{ padding: '3px' }">
                     <el-table-column label="学年" align="center" prop="schoolYear" show-overflow-tooltip />
                     <el-table-column label="学期" align="center" prop="semester" show-overflow-tooltip>
@@ -617,7 +619,7 @@
         <div style="border: 1px solid #f3f3f3;border-radius: 13px 13px 0 0 ; margin:  20px 0;">
             <div class="card_title">专业成长</div>
             <div style="margin: 3px 10px 15px;">
-                <el-table :data="specialityVos" :row-style="{ height: '0' }" :cell-style="{ padding: '3px' }">
+                <el-table border :data="specialityVos" :row-style="{ height: '0' }" :cell-style="{ padding: '3px' }">
                     <el-table-column label="成长类型" align="center" prop="growthType">
                     </el-table-column>
                     <el-table-column label="学科" align="center" prop="sub" show-overflow-tooltip>
@@ -628,7 +630,8 @@
                     <el-table-column label="获奖类别" align="center" prop="awardtype" show-overflow-tooltip>
                         <template slot-scope="scope">
                             <span v-if="scope.row.growthType == '综合荣誉'">{{ scope.row.awardtype }}</span>
-                            <dict-tag v-else :options="getDictionaryByGrowthType(scope.row)" :value="scope.row.awardtype" />
+                            <dict-tag v-else :options="getDictionaryByGrowthType(scope.row)"
+                                :value="scope.row.awardtype" />
                         </template>
                     </el-table-column>
                     <el-table-column label="获奖等级" align="center" prop="awardlevel" show-overflow-tooltip>
@@ -653,7 +656,8 @@
         <div style="border: 1px solid #f3f3f3;border-radius: 13px 13px 0 0 ; margin:  20px 0;">
             <div class="card_title">高考成绩 </div>
             <div style="margin: 3px 10px 15px;">
-                <el-table :data="schoolGkAchievement" :row-style="{ height: '0' }" :cell-style="{ padding: '3px' }">
+                <el-table border :data="schoolGkAchievement" :row-style="{ height: '0' }"
+                    :cell-style="{ padding: '3px' }">
                     <el-table-column label="届别" align="center" prop="year" show-overflow-tooltip />
                     <el-table-column label="学科" align="center" prop="sub" show-overflow-tooltip>
                         <template slot-scope="scope">
@@ -680,7 +684,8 @@
         <div style="border: 1px solid #f3f3f3;border-radius: 13px 13px 0 0 ; margin:  20px 0;">
             <div class="card_title">教学成绩</div>
             <div style="margin: 3px 10px 15px;">
-                <el-table :data="schoolXteachingAchievements" :row-style="{ height: '0' }" :cell-style="{ padding: '3px' }">
+                <el-table border :data="schoolXteachingAchievements" :row-style="{ height: '0' }"
+                    :cell-style="{ padding: '3px' }">
                     <el-table-column label="学年" align="center" prop="schoolYear" show-overflow-tooltip />
                     <el-table-column label="学期" align="center" prop="semester" show-overflow-tooltip>
                         <template slot-scope="scope">
@@ -713,6 +718,8 @@
                     </el-table-column>
                     <el-table-column label="班级类型" align="center" prop="classType" show-overflow-tooltip>
                     </el-table-column>
+                    <el-table-column label="常规增量" align="center" prop="cgzl" show-overflow-tooltip />
+                    <el-table-column label="优生增量" align="center" prop="yszl" show-overflow-tooltip />
                     <el-table-column label="增量分" align="center" prop="assessmentScore" show-overflow-tooltip />
                 </el-table>
             </div>
@@ -721,7 +728,7 @@
         <div style="border: 1px solid #f3f3f3;border-radius: 13px 13px 0 0 ; margin:  20px 0;">
             <div class="card_title">辅导老师获奖</div>
             <div style="margin: 3px 10px 15px;">
-                <el-table :data="fudaoTeacher" :row-style="{ height: '0' }" :cell-style="{ padding: '3px' }">
+                <el-table border :data="fudaoTeacher" :row-style="{ height: '0' }" :cell-style="{ padding: '3px' }">
                     <el-table-column label="成长类型" align="center">
                         <template>
                             <span>辅导老师获奖</span>
@@ -768,7 +775,7 @@
         <div style="border: 1px solid #f3f3f3;border-radius: 13px 13px 0 0 ; margin:  20px 0;">
             <div class="card_title">辅导学生获奖</div>
             <div style="margin: 3px 10px 15px;">
-                <el-table :data="fudaoStudent" :row-style="{ height: '0' }" :cell-style="{ padding: '3px' }">
+                <el-table border :data="fudaoStudent" :row-style="{ height: '0' }" :cell-style="{ padding: '3px' }">
                     <el-table-column label="成长类型" align="center">
                         <template>
                             <span>辅导学生获奖</span>
@@ -810,7 +817,8 @@
         <div style="border: 1px solid #f3f3f3;border-radius: 13px 13px 0 0 ; margin:  20px 0;">
             <div class="card_title">年度考核</div>
             <div style="margin: 3px 10px 15px;">
-                <el-table :data="schoolAnnualAssessment" :row-style="{ height: '0' }" :cell-style="{ padding: '3px' }">
+                <el-table border :data="schoolAnnualAssessment" :row-style="{ height: '0' }"
+                    :cell-style="{ padding: '3px' }">
                     <el-table-column label="姓名" align="center" prop="name" show-overflow-tooltip />
                     <el-table-column label="年度" align="center" prop="year" show-overflow-tooltip />
                     <el-table-column label="考核结果" align="center" prop="checkResult" show-overflow-tooltip>
@@ -827,7 +835,7 @@
         <div style="border: 1px solid #f3f3f3;border-radius: 13px 13px 0 0 ; margin:  20px 0;">
             <div class="card_title">青年教师成长档案</div>
             <div style="margin: 3px 10px 15px;">
-                <el-table :data="youthTeacherList">
+                <el-table border :data="youthTeacherList">
                     <el-table-column label="学年" align="center" prop="schoolYear" />
                     <el-table-column label="学期" align="center" prop="semester">
                         <template slot-scope="scope">
@@ -948,11 +956,11 @@ export default {
                         this.form.teachingSubject = item.label
                     }
                 })
-                this.dict.type.current_professional.find(item => {
-                    if (item.value == response.data.basicInformation.currentHiringProfessionalTitle) {
-                        this.form.currentHiringProfessionalTitle = item.label
-                    }
-                })
+                // this.dict.type.current_professional.find(item => {
+                //     if (item.value == response.data.basicInformation.currentHiringProfessionalTitle) {
+                //         this.form.currentHiringProfessionalTitle = item.label
+                //     }
+                // })
                 this.dict.type.current_joblevel.find(item => {
                     if (item.value == response.data.basicInformation.currentJobLevel) {
                         this.form.currentJobLevel = item.label
@@ -964,11 +972,11 @@ export default {
                     }
                 })
 
-                this.dict.type.current_professional.find(item => {
-                    if (item.value == response.data.basicInformation.currentProfessionalTitle) {
-                        this.form.currentProfessionalTitle = item.label
-                    }
-                })
+                // this.dict.type.current_professional.find(item => {
+                //     if (item.value == response.data.basicInformation.currentProfessionalTitle) {
+                //         this.form.currentProfessionalTitle = item.label
+                //     }
+                // })
                 this.dict.type.duty_situation.find(item => {
                     if (item.value == response.data.basicInformation.onDutySituation) {
                         this.form.onDutySituation = item.label
@@ -1143,4 +1151,9 @@ export default {
 .background {
     background-color: #eff8fc;
 }
+
+::v-deep.el-table--border .el-table__cell .cell {
+    padding-left: 0px !important;
+
+}
 </style>
\ No newline at end of file

ruoyi-ui/src/views/smartSchool/electronicArchives/professionalDevelopment/annualAssessment/index.vue

@@ -4,7 +4,8 @@
             class="search">
             <el-form-item label="年度" prop="year">
                 <el-select v-model="queryParams.year" clearable placeholder="请选择" style="width: 100%;">
-                    <el-option v-for="dict in dict.type.rankda" :key="dict.value" :label="dict.label" :value="dict.value">
+                    <el-option v-for="dict in dict.type.rankda" :key="dict.value" :label="dict.label"
+                        :value="dict.value">
                     </el-option>
                 </el-select>
             </el-form-item>
@@ -35,8 +36,8 @@
                     v-hasPermi="['school: annualAssessment:edit']">修改</el-button>
             </el-col>
             <el-col :span="1.5">
-                <el-button type="danger" plain icon="el-icon-delete" size="mini" :disabled="multiple" @click="handleDelete"
-                    v-hasPermi="['school:annualAssessment:remove']">删除</el-button>
+                <el-button type="danger" plain icon="el-icon-delete" size="mini" :disabled="multiple"
+                    @click="handleDelete" v-hasPermi="['school:annualAssessment:remove']">删除</el-button>
             </el-col>
             <el-col :span="1.5">
                 <el-button type="warning" plain icon="el-icon-download" size="mini" @click="handleExport"
@@ -49,7 +50,7 @@
             <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
         </el-row>
 
-        <el-table :data="assessmentList" @selection-change="handleSelectionChange" :row-style="{ height: '0' }"
+        <el-table border :data="assessmentList" @selection-change="handleSelectionChange" :row-style="{ height: '0' }"
             :cell-style="{ padding: '3px' }">
             <el-table-column type="selection" width="55" align="center" />
             <el-table-column type="index" width="55" label="序号" align="center" />
@@ -71,14 +72,15 @@
             </el-table-column>
         </el-table>
 
-        <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize"
-            @pagination="getList" />
+        <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum"
+            :limit.sync="queryParams.pageSize" @pagination="getList" />
         <el-dialog :title="title" :visible.sync="uploadOpen" width="520px" append-to-body inline @close="cancel">
             <el-form ref="uploadForm" :model="uploadForm" :rules="rules" label-width="70px">
                 <el-form-item prop="dataUrl">
                     <el-upload ref="upload" :limit="1" accept=".xlsx, .xls" :headers="upload.headers"
                         :action="upload.url + '?updateSupport=' + upload.updateSupport" :disabled="upload.isUploading"
-                        :on-progress="handleFileUploadProgress" :on-success="handleFileSuccess" :auto-upload="false" drag>
+                        :on-progress="handleFileUploadProgress" :on-success="handleFileSuccess" :auto-upload="false"
+                        drag>
                         <i class="el-icon-upload"></i>
                         <div class="el-upload__text">将文件拖到此处，或<em>点击上传</em></div>
                         <div class="el-upload__tip text-center" slot="tip">
@@ -397,4 +399,9 @@ export default {
 .search ::v-deep .el-form-item__content {
     width: 200px
 }
+
+::v-deep.el-table--border .el-table__cell .cell {
+    padding-left: 0px !important;
+
+}
 </style>
\ No newline at end of file

ruoyi-ui/src/views/smartSchool/electronicArchives/professionalDevelopment/awardTutoringstu/index.vue

@@ -6,8 +6,8 @@
                     <el-col :span="12">
                         <el-form-item label="学科" prop="sub">
                             <el-select v-model="queryParams.sub" clearable placeholder="请选择" style="width: 100%;">
-                                <el-option v-for="dict in dict.type.teaching_subjects" :key="dict.value" :label="dict.label"
-                                    :value="dict.value">
+                                <el-option v-for="dict in dict.type.teaching_subjects" :key="dict.value"
+                                    :label="dict.label" :value="dict.value">
                                 </el-option>
                             </el-select>
                         </el-form-item>
@@ -15,8 +15,8 @@
                     <el-col :span="12">
                         <el-form-item label="获奖类别" prop="awardtype">
                             <el-select v-model="queryParams.awardtype" clearable placeholder="请选择" style="width: 100%;">
-                                <el-option v-for="dict in dict.type.award_type_fdxs" :key="dict.value" :label="dict.label"
-                                    :value="dict.value">
+                                <el-option v-for="dict in dict.type.award_type_fdxs" :key="dict.value"
+                                    :label="dict.label" :value="dict.value">
                                 </el-option>
                             </el-select>
                         </el-form-item>
@@ -34,7 +34,8 @@
                     </el-col>
                     <el-col :span="12">
                         <el-form-item label="获奖等级" prop="awardlevel">
-                            <el-select v-model="queryParams.awardlevel" clearable placeholder="请选择" style="width: 100%;">
+                            <el-select v-model="queryParams.awardlevel" clearable placeholder="请选择"
+                                style="width: 100%;">
                                 <el-option v-for="dict in dict.type.award_rank" :key="dict.value" :label="dict.label"
                                     :value="dict.value">
                                 </el-option>
@@ -58,15 +59,15 @@
                 <el-row>
                     <el-col :span="12">
                         <el-form-item label="获奖开始时间" prop="startTime">
-                            <el-date-picker clearable v-model="queryParams.startTime" type="date" value-format="yyyy-MM-dd"
-                                placeholder="请选择" style="width: 100%;">
+                            <el-date-picker clearable v-model="queryParams.startTime" type="date"
+                                value-format="yyyy-MM-dd" placeholder="请选择" style="width: 100%;">
                             </el-date-picker>
                         </el-form-item>
                     </el-col>
                     <el-col :span="12">
                         <el-form-item label="获奖结束时间" prop="endTime">
-                            <el-date-picker clearable v-model="queryParams.endTime" type="date" value-format="yyyy-MM-dd"
-                                placeholder="请选择" style="width: 100%;">
+                            <el-date-picker clearable v-model="queryParams.endTime" type="date"
+                                value-format="yyyy-MM-dd" placeholder="请选择" style="width: 100%;">
                             </el-date-picker>
                         </el-form-item>
                     </el-col>
@@ -90,8 +91,8 @@
                     v-hasPermi="['school:fudaos:edit']">修改</el-button>
             </el-col>
             <el-col :span="1.5">
-                <el-button type="danger" plain icon="el-icon-delete" size="mini" :disabled="multiple" @click="handleDelete"
-                    v-hasPermi="['school:fudaos:delete']">删除</el-button>
+                <el-button type="danger" plain icon="el-icon-delete" size="mini" :disabled="multiple"
+                    @click="handleDelete" v-hasPermi="['school:fudaos:delete']">删除</el-button>
             </el-col>
             <el-col :span="1.5">
                 <el-button type="warning" plain icon="el-icon-download" size="mini" @click="handleExport"
@@ -100,7 +101,7 @@
             <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
         </el-row>
 
-        <el-table :row-style="{ height: '1px' }" :cell-style="{ padding: '0px' }"
+        <el-table border :row-style="{ height: '1px' }" :cell-style="{ padding: '0px' }" @sort-change="sortChange"
             :header-cell-style="{ height: '50px', fontSize: '12px', padding: '0 0' }" :data="awardsList"
             @selection-change="handleSelectionChange" :default-sort="{ prop: 'awardtime', order: 'descending' }">
             <el-table-column type="selection" width="30" align="center" />
@@ -110,42 +111,43 @@
                     <span>辅导学生获奖</span>
                 </template>
             </el-table-column>
-            <el-table-column label="学科" align="center" prop="sub" sortable fixed="left" width="60px" show-overflow-tooltip>
+            <el-table-column label="学科" align="center" prop="sub" sortable fixed="left" width="60px"
+                show-overflow-tooltip>
                 <template slot-scope="scope">
                     <dict-tag :options="dict.type.teaching_subjects" :value="scope.row.sub" />
                 </template>
             </el-table-column>
-            <el-table-column label="获奖类别" align="center" prop="awardtype" sortable width="80px" show-overflow-tooltip>
+            <el-table-column label="获奖类别" align="center" prop="awardtype" sortable width="85px" show-overflow-tooltip>
                 <template slot-scope="scope">
                     <dict-tag :options="dict.type.award_type_fdxs" :value="scope.row.awardtype" />
                 </template>
             </el-table-column>
-            <el-table-column label="获奖等级" align="center" prop="awardlevel" sortable width="80px" show-overflow-tooltip>
+            <el-table-column label="获奖等级" align="center" prop="awardlevel" sortable width="85px" show-overflow-tooltip>
                 <template slot-scope="scope">
                     <dict-tag :options="dict.type.award_rank" :value="scope.row.awardlevel" />
                 </template>
             </el-table-column>
-            <el-table-column label="获奖级别" align="center" prop="awardrank" sortable width="100px" show-overflow-tooltip>
+            <el-table-column label="获奖级别" align="center" prop="awardrank" sortable width="85px" show-overflow-tooltip>
                 <template slot-scope="scope">
                     <dict-tag :options="dict.type.awards_level" :value="scope.row.awardrank" />
                 </template>
             </el-table-column>
-            <el-table-column label="比赛名称" align="center" prop="resultname" sortable width="120px" show-overflow-tooltip />
+            <el-table-column label="比赛名称" align="center" prop="resultname" sortable show-overflow-tooltip />
             <el-table-column label="获奖人" align="center" prop="username" sortable width="80px" show-overflow-tooltip />
             <el-table-column label="指导教师" align="center" prop="guidanceteacher" sortable width="80px"
                 show-overflow-tooltip />
             <el-table-column label="主办单位" align="center" prop="org" sortable width="100px" show-overflow-tooltip />
-            <el-table-column label="获奖时间" align="center" prop="awardtime"  sortable show-overflow-tooltip>
+            <el-table-column label="获奖时间" align="center" prop="awardtime" sortable show-overflow-tooltip width="95px">
                 <!-- <template slot-scope="scope">
                     <span>{{ parseTime(scope.row.awardTime, '{y}-{m}-{d}') }}</span>
                 </template> -->
             </el-table-column>
-            <el-table-column label="审核状态" align="center" prop="auditstate" sortable width="80" fixed="right">
+            <el-table-column label="审核状态" align="center" prop="auditstate" sortable width="74" fixed="right">
                 <template slot-scope="scope">
                     <dict-tag :options="dict.type.audit_states" :value="scope.row.auditstate" />
                 </template>
             </el-table-column>
-            <el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="160" fixed="right">
+            <el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="100" fixed="right">
                 <template slot-scope="scope">
                     <el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)"
                         v-hasPermi="['school:fudaos:edit']"
@@ -158,8 +160,8 @@
                 </template>
             </el-table-column>
         </el-table>
-        <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize"
-            @pagination="getList" />
+        <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum"
+            :limit.sync="queryParams.pageSize" @pagination="getList" />
 
         <!-- 添加或修改教师获奖对话框 -->
         <el-dialog :title="title" :visible.sync="open" width="1000px" append-to-body>
@@ -168,8 +170,8 @@
                     <el-col :span="12">
                         <el-form-item label="学科" prop="sub">
                             <el-select v-model="form.sub" clearable placeholder="请选择" style="width: 100%;">
-                                <el-option v-for="dict in dict.type.teaching_subjects" :key="dict.value" :label="dict.label"
-                                    :value="dict.value">
+                                <el-option v-for="dict in dict.type.teaching_subjects" :key="dict.value"
+                                    :label="dict.label" :value="dict.value">
                                 </el-option>
                             </el-select>
                         </el-form-item>
@@ -177,8 +179,8 @@
                     <el-col :span="12">
                         <el-form-item label="获奖类别" prop="awardtype">
                             <el-select v-model="form.awardtype" clearable placeholder="请选择" style="width: 100%;">
-                                <el-option v-for="dict in dict.type.award_type_fdxs" :key="dict.value" :label="dict.label"
-                                    :value="dict.value">
+                                <el-option v-for="dict in dict.type.award_type_fdxs" :key="dict.value"
+                                    :label="dict.label" :value="dict.value">
                                 </el-option>
                             </el-select>
                         </el-form-item>
@@ -272,8 +274,8 @@
                     <el-col :span="12">
                         <el-form-item label="学科" prop="sub">
                             <el-select v-model="form.sub" placeholder="请选择" style="width: 100%;">
-                                <el-option v-for="dict in dict.type.teaching_subjects" :key="dict.value" :label="dict.label"
-                                    :value="dict.value">
+                                <el-option v-for="dict in dict.type.teaching_subjects" :key="dict.value"
+                                    :label="dict.label" :value="dict.value">
                                 </el-option>
                             </el-select>
                         </el-form-item>
@@ -281,8 +283,8 @@
                     <el-col :span="12">
                         <el-form-item label="获奖类别" prop="awardtype">
                             <el-select v-model="form.awardtype" placeholder="请选择" style="width: 100%;">
-                                <el-option v-for="dict in dict.type.award_type_fdxs" :key="dict.value" :label="dict.label"
-                                    :value="dict.value">
+                                <el-option v-for="dict in dict.type.award_type_fdxs" :key="dict.value"
+                                    :label="dict.label" :value="dict.value">
                                 </el-option>
                             </el-select>
                         </el-form-item>
@@ -445,6 +447,8 @@ export default {
             queryParams: {
                 pageNum: 1,
                 pageSize: 10,
+                orderByColumn: "",
+                isAsc: "asc",
                 sub: null,
                 awardType: null,
                 awardRank: null,
@@ -502,6 +506,50 @@ export default {
         this.getList();
     },
     methods: {
+        //排序列
+        sortChange(data) {
+            console.log(data, 'data');
+            const { prop, order } = data
+            if (prop == 'awardtype') {
+                this.queryParams.orderByColumn = 'award_type'
+            }
+            if (prop == 'awardrank') {
+                this.queryParams.orderByColumn = 'award_rank'
+            }
+            if (prop == 'awardlevel') {
+                this.queryParams.orderByColumn = 'award_level'
+            }
+            if (prop == 'resultname') {
+                this.queryParams.orderByColumn = 'result_name'
+            }
+            if (prop == 'username') {
+                this.queryParams.orderByColumn = 'user_name'
+            }
+            if (prop == 'guidanceteacher') {
+                this.queryParams.orderByColumn = 'guidance_teacher'
+            }
+            if (prop == 'coachingr') {
+                this.queryParams.orderByColumn = ' coaching_responsibilities'
+            }
+            if (prop == 'awardtime') {
+                this.queryParams.orderByColumn = 'award_time'
+            }
+            if (prop == 'auditstate') {
+                this.queryParams.orderByColumn = 'audit_state'
+            }
+            //排序列
+            // this.queryParams.orderByColumn = prop;
+            //排序顺序ascending或descending
+            // this.queryParams.isAsc = order;
+            if (order == "ascending") {
+                this.queryParams.isAsc = 'asc';
+            } else {
+                this.queryParams.isAsc = 'desc';
+            }
+            //返回第一页
+            this.queryParams.pageNum = 1;
+            this.getList();
+        },
         /** 查询教师获奖列表 */
         getList() {
             this.loading = true;
@@ -728,7 +776,7 @@ export default {
     }
 };
 </script>
-<style scoped lang="scss" >
+<style scoped lang="scss">
 .avatar-uploader .el-upload {
     border: 1px dashed #d9d9d9;
     border-radius: 6px;
@@ -789,4 +837,9 @@ export default {
     padding: 0;
 
 }
+
+::v-deep.el-table--border .el-table__cell .cell {
+    padding-left: 0px !important;
+
+}
 </style>

ruoyi-ui/src/views/smartSchool/electronicArchives/professionalDevelopment/comprehensiveHonors/index.vue

@@ -6,8 +6,8 @@
                     <el-col :span="12">
                         <el-form-item label="学科" prop="sub">
                             <el-select v-model="queryParams.sub" clearable placeholder="请选择" style="width: 100%;">
-                                <el-option v-for="dict in dict.type.teaching_subjects" :key="dict.value" :label="dict.label"
-                                    :value="dict.value">
+                                <el-option v-for="dict in dict.type.teaching_subjects" :key="dict.value"
+                                    :label="dict.label" :value="dict.value">
                                 </el-option>
                             </el-select>
                         </el-form-item>
@@ -31,7 +31,8 @@
                     </el-col>
                     <el-col :span="12">
                         <el-form-item label="获奖等级" prop="awardLevel">
-                            <el-select v-model="queryParams.awardLevel" clearable placeholder="请选择" style="width: 100%;">
+                            <el-select v-model="queryParams.awardLevel" clearable placeholder="请选择"
+                                style="width: 100%;">
                                 <el-option v-for="dict in dict.type.award_rank" :key="dict.value" :label="dict.label"
                                     :value="dict.value">
                                 </el-option>
@@ -48,8 +49,8 @@
                     </el-col>
                     <el-col :span="12">
                         <el-form-item label="获奖开始时间" prop="startTime">
-                            <el-date-picker clearable v-model="queryParams.startTime" type="date" value-format="yyyy-MM-dd"
-                                placeholder="请选择" style="width: 100%;">
+                            <el-date-picker clearable v-model="queryParams.startTime" type="date"
+                                value-format="yyyy-MM-dd" placeholder="请选择" style="width: 100%;">
                             </el-date-picker>
                         </el-form-item>
                     </el-col>
@@ -57,8 +58,8 @@
                 <el-row>
                     <el-col :span="12">
                         <el-form-item label="获奖结束时间" prop="endTime">
-                            <el-date-picker clearable v-model="queryParams.endTime" type="date" value-format="yyyy-MM-dd"
-                                placeholder="请选择" style="width: 100%;">
+                            <el-date-picker clearable v-model="queryParams.endTime" type="date"
+                                value-format="yyyy-MM-dd" placeholder="请选择" style="width: 100%;">
                             </el-date-picker>
                         </el-form-item>
                     </el-col>
@@ -82,8 +83,8 @@
                     v-hasPermi="['system:honors:edit']">修改</el-button>
             </el-col>
             <el-col :span="1.5">
-                <el-button type="danger" plain icon="el-icon-delete" size="mini" :disabled="multiple" @click="handleDelete"
-                    v-hasPermi="['system:honors:remove']">删除</el-button>
+                <el-button type="danger" plain icon="el-icon-delete" size="mini" :disabled="multiple"
+                    @click="handleDelete" v-hasPermi="['system:honors:remove']">删除</el-button>
             </el-col>
             <el-col :span="1.5">
                 <el-button type="warning" plain icon="el-icon-download" size="mini" @click="handleExport"
@@ -92,18 +93,18 @@
             <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
         </el-row>
 
-        <el-table :row-style="{ height: '1px' }" :cell-style="{ padding: '0px' }"
+        <el-table border :row-style="{ height: '1px' }" :cell-style="{ padding: '0px' }" @sort-change="sortChange"
             :header-cell-style="{ height: '50px', fontSize: '12px', padding: '0 0' }" :data="honorsList"
             @selection-change="handleSelectionChange" :default-sort="{ prop: 'awardTime', order: 'descending' }">
             <el-table-column type="selection" width="30" align="center" />
             <el-table-column type="index" label="序号" width="30" align="center" sortable fixed="left" />
-            <el-table-column label="成长类型" align="center" prop="type" sortable width="80px" fixed="left"
-                show-overflow-tooltip>
+            <el-table-column label="成长类型" align="center" prop="type" width="80px" fixed="left" show-overflow-tooltip>
                 <template>
                     <span>综合荣誉</span>
                 </template>
             </el-table-column>
-            <el-table-column label="学科" align="center" prop="sub" sortable fixed="left" width="65px" show-overflow-tooltip>
+            <el-table-column label="学科" align="center" prop="sub" sortable fixed="left" width="65px"
+                show-overflow-tooltip>
                 <template slot-scope="scope">
                     <dict-tag :options="dict.type.teaching_subjects" :value="scope.row.sub" />
                 </template>
@@ -119,11 +120,11 @@
                     <dict-tag :options="dict.type.awards_level" :value="scope.row.awardRank" />
                 </template>
             </el-table-column>
-            <el-table-column label="综合荣誉-成果名称" align="center" prop="resultName" sortable width="140px"
+            <el-table-column label="综合荣誉-成果名称" align="center" prop="resultName" sortable width="150px"
                 show-overflow-tooltip />
             <el-table-column label="获奖人" align="center" prop="userName" sortable width="80px" show-overflow-tooltip />
-            <el-table-column label="主办单位" align="center" prop="org" sortable width="100px" show-overflow-tooltip />
-            <el-table-column label="获奖时间" align="center" prop="awardTime" sortable show-overflow-tooltip>
+            <el-table-column label="主办单位" align="center" prop="org" sortable width="110px" show-overflow-tooltip />
+            <el-table-column label="获奖时间" align="center" prop="awardTime" width="100px" sortable show-overflow-tooltip>
                 <template slot-scope="scope">
                     <span>{{ parseTime(scope.row.awardTime, '{y}-{m}-{d}') }}</span>
                 </template>
@@ -133,7 +134,9 @@
                     <dict-tag :options="dict.type.audit_states" :value="scope.row.auditState" />
                 </template>
             </el-table-column>
-            <el-table-column label="操作" align="center" class-name="small-padding fixed-width" fixed="right" width="160px">
+            <el-table-column label="备注" align="center" prop="remark" sortable show-overflow-tooltip />
+            <el-table-column label="操作" align="center" class-name="small-padding fixed-width" fixed="right"
+                width="160px">
                 <template slot-scope="scope">
                     <el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)"
                         v-hasPermi="['system:honors:edit']"
@@ -147,8 +150,8 @@
             </el-table-column>
         </el-table>
 
-        <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize"
-            @pagination="getList" />
+        <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum"
+            :limit.sync="queryParams.pageSize" @pagination="getList" />
 
         <!-- 添加或修改综合荣誉对话框 -->
         <el-dialog title="详细信息" :visible.sync="open" width="1000px" append-to-body>
@@ -157,8 +160,8 @@
                     <el-col :span="12">
                         <el-form-item label="学科" prop="sub">
                             <el-select v-model="form.sub" clearable placeholder="请选择" style="width: 100%;">
-                                <el-option v-for="dict in dict.type.teaching_subjects" :key="dict.value" :label="dict.label"
-                                    :value="dict.value">
+                                <el-option v-for="dict in dict.type.teaching_subjects" :key="dict.value"
+                                    :label="dict.label" :value="dict.value">
                                 </el-option>
                             </el-select>
                         </el-form-item>
@@ -252,8 +255,8 @@
                     <el-col :span="12">
                         <el-form-item label="学科" prop="sub">
                             <el-select v-model="form.sub" placeholder="请选择" style="width: 100%;">
-                                <el-option v-for="dict in dict.type.teaching_subjects" :key="dict.value" :label="dict.label"
-                                    :value="dict.value">
+                                <el-option v-for="dict in dict.type.teaching_subjects" :key="dict.value"
+                                    :label="dict.label" :value="dict.value">
                                 </el-option>
                             </el-select>
                         </el-form-item>
@@ -395,6 +398,8 @@ export default {
             queryParams: {
                 pageNum: 1,
                 pageSize: 10,
+                orderByColumn: "",
+                isAsc: "asc",
                 sub: "",
                 awardType: "",
                 awardRank: "",
@@ -442,6 +447,23 @@ export default {
         this.getList();
     },
     methods: {
+        //排序列
+        sortChange(data) {
+            console.log(data, 'data');
+            const { prop, order } = data
+            //排序列
+            this.queryParams.orderByColumn = prop;
+            //排序顺序ascending或descending
+            // this.queryParams.isAsc = order;
+            if (order == "ascending") {
+                this.queryParams.isAsc = 'asc';
+            } else {
+                this.queryParams.isAsc = 'desc';
+            }
+            //返回第一页
+            this.queryParams.pageNum = 1;
+            this.getList();
+        },
         /** 查询综合荣誉列表 */
         getList() {
             this.loading = true;
@@ -696,7 +718,7 @@ export default {
     }
 };
 </script>
-<style scoped lang="scss" >
+<style scoped lang="scss">
 .avatar-uploader .el-upload {
     border: 1px dashed #d9d9d9;
     border-radius: 6px;
@@ -758,4 +780,8 @@ export default {
 
 }
 
+::v-deep.el-table--border .el-table__cell .cell {
+    padding-left: 0px !important;
+
+}
 </style>

ruoyi-ui/src/views/smartSchool/electronicArchives/professionalDevelopment/essaysWritings/index.vue

-
 <template>
     <div class="app-container">
         <el-dialog title="查询" :visible.sync="query" width="50%" append-to-body>
@@ -7,8 +6,8 @@
                     <el-col :span="12">
                         <el-form-item label="学科" prop="sub">
                             <el-select v-model="queryParams.sub" clearable placeholder="请选择" style="width: 100%;">
-                                <el-option v-for="dict in dict.type.teaching_subjects" :key="dict.value" :label="dict.label"
-                                    :value="dict.value">
+                                <el-option v-for="dict in dict.type.teaching_subjects" :key="dict.value"
+                                    :label="dict.label" :value="dict.value">
                                 </el-option>
                             </el-select>
                         </el-form-item>
@@ -35,7 +34,8 @@
                     </el-col>
                     <el-col :span="12">
                         <el-form-item label="获奖等级" prop="awardLevel">
-                            <el-select v-model="queryParams.awardLevel" clearable placeholder="请选择" style="width: 100%;">
+                            <el-select v-model="queryParams.awardLevel" clearable placeholder="请选择"
+                                style="width: 100%;">
                                 <el-option v-for="dict in dict.type.award_rank" :key="dict.value" :label="dict.label"
                                     :value="dict.value">
                                 </el-option>
@@ -52,15 +52,15 @@
                     </el-col>
                     <el-col :span="12">
                         <el-form-item label="获奖开始时间" prop="awardTime">
-                            <el-date-picker clearable v-model="queryParams.startTime" type="date" value-format="yyyy-MM-dd"
-                                placeholder="请选择" style="width: 100%;">
+                            <el-date-picker clearable v-model="queryParams.startTime" type="date"
+                                value-format="yyyy-MM-dd" placeholder="请选择" style="width: 100%;">
                             </el-date-picker>
                         </el-form-item>
                     </el-col>
                     <el-col :span="12">
                         <el-form-item label="获奖结束时间" prop="awardTime">
-                            <el-date-picker clearable v-model="queryParams.endTime" type="date" value-format="yyyy-MM-dd"
-                                placeholder="请选择" style="width: 100%;">
+                            <el-date-picker clearable v-model="queryParams.endTime" type="date"
+                                value-format="yyyy-MM-dd" placeholder="请选择" style="width: 100%;">
                             </el-date-picker>
                         </el-form-item>
                     </el-col>
@@ -84,8 +84,8 @@
                     v-hasPermi="['system:works:edit']">修改</el-button>
             </el-col>
             <el-col :span="1.5">
-                <el-button type="danger" plain icon="el-icon-delete" size="mini" :disabled="multiple" @click="handleDelete"
-                    v-hasPermi="['system:works:remove']">删除</el-button>
+                <el-button type="danger" plain icon="el-icon-delete" size="mini" :disabled="multiple"
+                    @click="handleDelete" v-hasPermi="['system:works:remove']">删除</el-button>
             </el-col>
             <el-col :span="1.5">
                 <el-button type="warning" plain icon="el-icon-download" size="mini" @click="handleExport"
@@ -93,7 +93,7 @@
             </el-col>
             <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
         </el-row>
-        <el-table :row-style="{ height: '1px' }" :cell-style="{ padding: '0px' }"
+        <el-table border :row-style="{ height: '1px' }" :cell-style="{ padding: '0px' }"
             :header-cell-style="{ height: '50px', fontSize: '12px', padding: '0 0' }" :data="worksList"
             @selection-change="handleSelectionChange" :default-sort="{ prop: 'awardTime', order: 'descending' }">
             <el-table-column type="selection" width="30" align="center" />
@@ -103,7 +103,8 @@
                     <span>论文论著</span>
                 </template>
             </el-table-column>
-            <el-table-column label="学科" align="center" prop="sub" sortable fixed="left" width="60px" show-overflow-tooltip>
+            <el-table-column label="学科" align="center" prop="sub" sortable fixed="left" width="60px"
+                show-overflow-tooltip>
                 <template slot-scope="scope">
                     <dict-tag :options="dict.type.teaching_subjects" :value="scope.row.sub" />
                 </template>
@@ -123,11 +124,10 @@
                     <dict-tag :options="dict.type.awards_level" :value="scope.row.awardRank" />
                 </template>
             </el-table-column>
-            <el-table-column label="论文论著-成果名称" align="center" prop="resultName" sortable width="130px"
-                show-overflow-tooltip />
+            <el-table-column label="论文论著-成果名称" align="center" prop="resultName" sortable show-overflow-tooltip />
             <el-table-column label="获奖人" align="center" prop="userName" sortable width="80px" show-overflow-tooltip />
-            <el-table-column label="主办单位" align="center" prop="org" sortable width="100px" show-overflow-tooltip />
-            <el-table-column label="获奖时间" align="center" prop="awardTime"  sortable show-overflow-tooltip>
+            <el-table-column label="主办单位" align="center" prop="org" sortable width="110px" show-overflow-tooltip />
+            <el-table-column label="获奖时间" align="center" prop="awardTime" width="100px" sortable show-overflow-tooltip>
                 <template slot-scope="scope">
                     <span>{{ parseTime(scope.row.awardTime, '{y}-{m}-{d}') }}</span>
                 </template>
@@ -137,7 +137,8 @@
                     <dict-tag :options="dict.type.audit_states" :value="scope.row.auditState" />
                 </template>
             </el-table-column>
-            <el-table-column label="操作" align="center" class-name="small-padding fixed-width" fixed="right" width="150px">
+            <el-table-column label="操作" align="center" class-name="small-padding fixed-width" fixed="right"
+                width="150px">
                 <template slot-scope="scope">
                     <el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)"
                         v-hasPermi="['system:honors:edit']"
@@ -151,8 +152,8 @@
             </el-table-column>
         </el-table>
 
-        <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize"
-            @pagination="getList" />
+        <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum"
+            :limit.sync="queryParams.pageSize" @pagination="getList" />
 
         <!-- 添加或修改论文著作对话框 -->
         <el-dialog :title="title" :visible.sync="open" width="1000px" append-to-body>
@@ -161,8 +162,8 @@
                     <el-col :span="12">
                         <el-form-item label="学科" prop="sub">
                             <el-select v-model="form.sub" clearable placeholder="请选择" style="width: 100%;">
-                                <el-option v-for="dict in dict.type.teaching_subjects" :key="dict.value" :label="dict.label"
-                                    :value="dict.value">
+                                <el-option v-for="dict in dict.type.teaching_subjects" :key="dict.value"
+                                    :label="dict.label" :value="dict.value">
                                 </el-option>
                             </el-select>
                         </el-form-item>
@@ -170,8 +171,8 @@
                     <el-col :span="12">
                         <el-form-item label="获奖类别" prop="awardType">
                             <el-select v-model="form.awardType" clearable placeholder="请选择" style="width: 100%;">
-                                <el-option v-for="dict in dict.type.award_categories" :key="dict.value" :label="dict.label"
-                                    :value="dict.value">
+                                <el-option v-for="dict in dict.type.award_categories" :key="dict.value"
+                                    :label="dict.label" :value="dict.value">
                                 </el-option>
                             </el-select>
                         </el-form-item>
@@ -260,8 +261,8 @@
                     <el-col :span="12">
                         <el-form-item label="学科" prop="sub">
                             <el-select v-model="form.sub" placeholder="请选择" style="width: 100%;">
-                                <el-option v-for="dict in dict.type.teaching_subjects" :key="dict.value" :label="dict.label"
-                                    :value="dict.value">
+                                <el-option v-for="dict in dict.type.teaching_subjects" :key="dict.value"
+                                    :label="dict.label" :value="dict.value">
                                 </el-option>
                             </el-select>
                         </el-form-item>
@@ -694,7 +695,7 @@ export default {
     }
 };
 </script>
-<style scoped lang="scss" >
+<style scoped lang="scss">
 .avatar-uploader .el-upload {
     border: 1px dashed #d9d9d9;
     border-radius: 6px;
@@ -755,4 +756,9 @@ export default {
     padding: 0;
 
 }
+
+::v-deep.el-table--border .el-table__cell .cell {
+    padding-left: 0px !important;
+
+}
 </style>

ruoyi-ui/src/views/smartSchool/electronicArchives/professionalDevelopment/lectureAwards/index.vue

@@ -6,8 +6,8 @@
                     <el-col :span="12">
                         <el-form-item label="学科" prop="sub">
                             <el-select v-model="queryParams.sub" clearable placeholder="请选择" style="width: 100%;">
-                                <el-option v-for="dict in dict.type.teaching_subjects" :key="dict.value" :label="dict.label"
-                                    :value="dict.value">
+                                <el-option v-for="dict in dict.type.teaching_subjects" :key="dict.value"
+                                    :label="dict.label" :value="dict.value">
                                 </el-option>
                             </el-select>
                         </el-form-item>
@@ -34,7 +34,8 @@
                     </el-col>
                     <el-col :span="12">
                         <el-form-item label="获奖等级" prop="awardLevel">
-                            <el-select v-model="queryParams.awardLevel" clearable placeholder="请选择" style="width: 100%;">
+                            <el-select v-model="queryParams.awardLevel" clearable placeholder="请选择"
+                                style="width: 100%;">
                                 <el-option v-for="dict in dict.type.award_rank" :key="dict.value" :label="dict.label"
                                     :value="dict.value">
                                 </el-option>
@@ -51,15 +52,15 @@
                     </el-col>
                     <el-col :span="12">
                         <el-form-item label="获奖开始时间" prop="awardTime">
-                            <el-date-picker clearable v-model="queryParams.startTime" type="date" value-format="yyyy-MM-dd"
-                                placeholder="请选择" style="width: 100%;">
+                            <el-date-picker clearable v-model="queryParams.startTime" type="date"
+                                value-format="yyyy-MM-dd" placeholder="请选择" style="width: 100%;">
                             </el-date-picker>
                         </el-form-item>
                     </el-col>
                     <el-col :span="12">
                         <el-form-item label="获奖结束时间" prop="awardTime">
-                            <el-date-picker clearable v-model="queryParams.endTime" type="date" value-format="yyyy-MM-dd"
-                                placeholder="请选择" style="width: 100%;">
+                            <el-date-picker clearable v-model="queryParams.endTime" type="date"
+                                value-format="yyyy-MM-dd" placeholder="请选择" style="width: 100%;">
                             </el-date-picker>
                         </el-form-item>
                     </el-col>
@@ -83,8 +84,8 @@
                     v-hasPermi="['system:awards:edit']">修改</el-button>
             </el-col>
             <el-col :span="1.5">
-                <el-button type="danger" plain icon="el-icon-delete" size="mini" :disabled="multiple" @click="handleDelete"
-                    v-hasPermi="['system:awards:remove']">删除</el-button>
+                <el-button type="danger" plain icon="el-icon-delete" size="mini" :disabled="multiple"
+                    @click="handleDelete" v-hasPermi="['system:awards:remove']">删除</el-button>
             </el-col>
             <el-col :span="1.5">
                 <el-button type="warning" plain icon="el-icon-download" size="mini" @click="handleExport"
@@ -92,7 +93,7 @@
             </el-col>
             <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
         </el-row>
-        <el-table :row-style="{ height: '1px' }" :cell-style="{ padding: '0px' }"
+        <el-table border :row-style="{ height: '1px' }" :cell-style="{ padding: '0px' }"
             :header-cell-style="{ height: '50px', fontSize: '12px', padding: '0 0' }" :data="awardsList"
             @selection-change="handleSelectionChange" :default-sort="{ prop: 'awardTime', order: 'descending' }">
             <el-table-column type="selection" width="30" align="center" />
@@ -102,7 +103,8 @@
                     <span>讲课获奖</span>
                 </template>
             </el-table-column>
-            <el-table-column label="学科" align="center" prop="sub" sortable fixed="left" show-overflow-tooltip width="65px">
+            <el-table-column label="学科" align="center" prop="sub" sortable fixed="left" show-overflow-tooltip
+                width="65px">
                 <template slot-scope="scope">
                     <dict-tag :options="dict.type.teaching_subjects" :value="scope.row.sub" />
                 </template>
@@ -122,11 +124,10 @@
                     <dict-tag :options="dict.type.awards_level" :value="scope.row.awardRank" />
                 </template>
             </el-table-column>
-            <el-table-column label="讲课获奖-成果名称" align="center" prop="resultName" sortable width="140px"
-                show-overflow-tooltip />
+            <el-table-column label="讲课获奖-成果名称" align="center" prop="resultName" sortable show-overflow-tooltip />
             <el-table-column label="获奖人" align="center" prop="userName" sortable width="80px" show-overflow-tooltip />
-            <el-table-column label="主办单位" align="center" prop="org" sortable width="100px" show-overflow-tooltip />
-            <el-table-column label="获奖时间" align="center" prop="awardTime"  sortable show-overflow-tooltip>
+            <el-table-column label="主办单位" align="center" prop="org" sortable width="110px" show-overflow-tooltip />
+            <el-table-column label="获奖时间" align="center" prop="awardTime" width="100px" sortable show-overflow-tooltip>
                 <template slot-scope="scope">
                     <span>{{ parseTime(scope.row.awardTime, '{y}-{m}-{d}') }}</span>
                 </template>
@@ -136,7 +137,8 @@
                     <dict-tag :options="dict.type.audit_states" :value="scope.row.auditState" />
                 </template>
             </el-table-column>
-            <el-table-column label="操作" align="center" class-name="small-padding fixed-width" fixed="right" width="160px">
+            <el-table-column label="操作" align="center" class-name="small-padding fixed-width" fixed="right"
+                width="160px">
                 <template slot-scope="scope">
                     <el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)"
                         v-hasPermi="['system:honors:edit']"
@@ -150,8 +152,8 @@
             </el-table-column>
         </el-table>
 
-        <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize"
-            @pagination="getList" />
+        <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum"
+            :limit.sync="queryParams.pageSize" @pagination="getList" />
 
         <!-- 添加或修改讲课获奖对话框 -->
         <el-dialog :title="title" :visible.sync="open" width="1000px" append-to-body>
@@ -160,8 +162,8 @@
                     <el-col :span="12">
                         <el-form-item label="学科" prop="sub">
                             <el-select v-model="form.sub" clearable placeholder="请选择" style="width: 100%;">
-                                <el-option v-for="dict in dict.type.teaching_subjects" :key="dict.value" :label="dict.label"
-                                    :value="dict.value">
+                                <el-option v-for="dict in dict.type.teaching_subjects" :key="dict.value"
+                                    :label="dict.label" :value="dict.value">
                                 </el-option>
                             </el-select>
                         </el-form-item>
@@ -260,8 +262,8 @@
                     <el-col :span="12">
                         <el-form-item label="学科" prop="sub">
                             <el-select v-model="form.sub" placeholder="请选择" style="width: 100%;">
-                                <el-option v-for="dict in dict.type.teaching_subjects" :key="dict.value" :label="dict.label"
-                                    :value="dict.value">
+                                <el-option v-for="dict in dict.type.teaching_subjects" :key="dict.value"
+                                    :label="dict.label" :value="dict.value">
                                 </el-option>
                             </el-select>
                         </el-form-item>
@@ -692,7 +694,7 @@ export default {
     }
 };
 </script>
-<style scoped lang="scss" >
+<style scoped lang="scss">
 .avatar-uploader .el-upload {
     border: 1px dashed #d9d9d9;
     border-radius: 6px;
@@ -753,4 +755,9 @@ export default {
     padding: 0;
 
 }
+
+::v-deep.el-table--border .el-table__cell .cell {
+    padding-left: 0px !important;
+
+}
 </style>

ruoyi-ui/src/views/smartSchool/electronicArchives/professionalDevelopment/projectResearch/index.vue

-
 <template>
     <div class="app-container">
         <el-dialog title="查询" :visible.sync="query" width="50%" append-to-body>
@@ -7,8 +6,8 @@
                     <el-col :span="12">
                         <el-form-item label="学科" prop="sub">
                             <el-select v-model="queryParams.sub" clearable placeholder="请选择" style="width: 100%;">
-                                <el-option v-for="dict in dict.type.teaching_subjects" :key="dict.value" :label="dict.label"
-                                    :value="dict.value">
+                                <el-option v-for="dict in dict.type.teaching_subjects" :key="dict.value"
+                                    :label="dict.label" :value="dict.value">
                                 </el-option>
                             </el-select>
                         </el-form-item>
@@ -35,7 +34,8 @@
                     </el-col>
                     <el-col :span="12">
                         <el-form-item label="获奖等级" prop="awardLevel">
-                            <el-select v-model="queryParams.awardLevel" clearable placeholder="请选择" style="width: 100%;">
+                            <el-select v-model="queryParams.awardLevel" clearable placeholder="请选择"
+                                style="width: 100%;">
                                 <el-option v-for="dict in dict.type.award_rank" :key="dict.value" :label="dict.label"
                                     :value="dict.value">
                                 </el-option>
@@ -52,15 +52,15 @@
                     </el-col>
                     <el-col :span="12">
                         <el-form-item label="获奖开始时间" prop="awardTime">
-                            <el-date-picker clearable v-model="queryParams.startTime" type="date" value-format="yyyy-MM-dd"
-                                placeholder="请选择" style="width: 100%;">
+                            <el-date-picker clearable v-model="queryParams.startTime" type="date"
+                                value-format="yyyy-MM-dd" placeholder="请选择" style="width: 100%;">
                             </el-date-picker>
                         </el-form-item>
                     </el-col>
                     <el-col :span="12">
                         <el-form-item label="获奖结束时间" prop="awardTime">
-                            <el-date-picker clearable v-model="queryParams.endTime" type="date" value-format="yyyy-MM-dd"
-                                placeholder="请选择" style="width: 100%;">
+                            <el-date-picker clearable v-model="queryParams.endTime" type="date"
+                                value-format="yyyy-MM-dd" placeholder="请选择" style="width: 100%;">
                             </el-date-picker>
                         </el-form-item>
                     </el-col>
@@ -71,7 +71,6 @@
                 </el-form-item>
             </el-form>
         </el-dialog>
-
         <el-row :gutter="10" class="mb8">
             <el-col :span="1.5">
                 <el-button type="primary" plain icon="el-icon-search" size="mini" @click="handleQuerycx">查询</el-button>
@@ -85,8 +84,8 @@
                     v-hasPermi="['system:research:edit']">修改</el-button>
             </el-col>
             <el-col :span="1.5">
-                <el-button type="danger" plain icon="el-icon-delete" size="mini" :disabled="multiple" @click="handleDelete"
-                    v-hasPermi="['system:research: remove']">删除</el-button>
+                <el-button type="danger" plain icon="el-icon-delete" size="mini" :disabled="multiple"
+                    @click="handleDelete" v-hasPermi="['system:research: remove']">删除</el-button>
             </el-col>
             <el-col :span="1.5">
                 <el-button type="warning" plain icon="el-icon-download" size="mini" @click="handleExport"
@@ -95,15 +94,16 @@
             <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
         </el-row>
 
-        <el-table :row-style="{ height: '1px' }" :cell-style="{ padding: '0px' }"
+        <el-table border :row-style="{ height: '1px' }" :cell-style="{ padding: '0px' }" @sort-change="sortChange"
             :header-cell-style="{ height: '50px', fontSize: '12px', padding: '0 0' }" :data="worksList"
             @selection-change="handleSelectionChange" :default-sort="{ prop: 'awardTime', order: 'descending' }">
             <el-table-column type="selection" width="30" align="center" />
             <el-table-column type="index" label="序号" width="30" align="center" sortable fixed="left" />
-            <el-table-column label="成长类型" align="center" sortable fixed="left" width="80px" show-overflow-tooltip>
+            <el-table-column label="成长类型" align="center" fixed="left" width="80px" show-overflow-tooltip>
                 <span>课题研究</span>
             </el-table-column>
-            <el-table-column label="学科" align="center" prop="sub" sortable fixed="left" width="60px" show-overflow-tooltip>
+            <el-table-column label="学科" align="center" prop="sub" sortable fixed="left" width="60px"
+                show-overflow-tooltip>
                 <template slot-scope="scope">
                     <dict-tag :options="dict.type.teaching_subjects" :value="scope.row.sub" />
                 </template>
@@ -123,11 +123,10 @@
                     <dict-tag :options="dict.type.awards_level" :value="scope.row.awardRank" />
                 </template>
             </el-table-column>
-            <el-table-column label="课题研究-成果名称" align="center" prop="resultName" sortable width="140px"
-                show-overflow-tooltip />
+            <el-table-column label="课题研究-成果名称" align="center" prop="resultName" sortable show-overflow-tooltip />
             <el-table-column label="获奖人" align="center" prop="userName" sortable width="80px" show-overflow-tooltip />
-            <el-table-column label="主办单位" align="center" prop="org" sortable width="100px" show-overflow-tooltip />
-            <el-table-column label="获奖时间" align="center" prop="awardTime"  sortable show-overflow-tooltip>
+            <el-table-column label="主办单位" align="center" prop="org" sortable width="110px" show-overflow-tooltip />
+            <el-table-column label="获奖时间" align="center" prop="awardTime" sortable width="100px" show-overflow-tooltip>
                 <template slot-scope="scope">
                     <span>{{ parseTime(scope.row.awardTime, '{y}-{m}-{d}') }}</span>
                 </template>
@@ -137,7 +136,8 @@
                     <dict-tag :options="dict.type.audit_states" :value="scope.row.auditState" />
                 </template>
             </el-table-column>
-            <el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="150px" fixed="right">
+            <el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="150px"
+                fixed="right">
                 <template slot-scope="scope">
                     <el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)"
                         v-hasPermi="['system:research:edit']"
@@ -151,8 +151,8 @@
             </el-table-column>
         </el-table>
 
-        <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize"
-            @pagination="getList" />
+        <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum"
+            :limit.sync="queryParams.pageSize" @pagination="getList" />
 
         <!-- 添加或修改论文著作对话框 -->
         <el-dialog :title="title" :visible.sync="open" width="1000px" append-to-body>
@@ -161,8 +161,8 @@
                     <el-col :span="12">
                         <el-form-item label="学科" prop="sub">
                             <el-select v-model="form.sub" clearable placeholder="请选择" style="width: 100%;">
-                                <el-option v-for="dict in dict.type.teaching_subjects" :key="dict.value" :label="dict.label"
-                                    :value="dict.value">
+                                <el-option v-for="dict in dict.type.teaching_subjects" :key="dict.value"
+                                    :label="dict.label" :value="dict.value">
                                 </el-option>
                             </el-select>
                         </el-form-item>
@@ -170,8 +170,8 @@
                     <el-col :span="12">
                         <el-form-item label="获奖类别" prop="awardType">
                             <el-select v-model="form.awardType" clearable placeholder="请选择" style="width: 100%;">
-                                <el-option v-for="dict in dict.type.project_research" :key="dict.value" :label="dict.label"
-                                    :value="dict.value">
+                                <el-option v-for="dict in dict.type.project_research" :key="dict.value"
+                                    :label="dict.label" :value="dict.value">
                                 </el-option>
                             </el-select>
                         </el-form-item>
@@ -260,8 +260,8 @@
                     <el-col :span="12">
                         <el-form-item label="学科" prop="sub">
                             <el-select v-model="form.sub" placeholder="请选择" style="width: 100%;">
-                                <el-option v-for="dict in dict.type.teaching_subjects" :key="dict.value" :label="dict.label"
-                                    :value="dict.value">
+                                <el-option v-for="dict in dict.type.teaching_subjects" :key="dict.value"
+                                    :label="dict.label" :value="dict.value">
                                 </el-option>
                             </el-select>
                         </el-form-item>
@@ -269,8 +269,8 @@
                     <el-col :span="12">
                         <el-form-item label="获奖类别" prop="awardType">
                             <el-select v-model="form.awardType" placeholder="请选择" style="width: 100%;">
-                                <el-option v-for="dict in dict.type.project_research" :key="dict.value" :label="dict.label"
-                                    :value="dict.value">
+                                <el-option v-for="dict in dict.type.project_research" :key="dict.value"
+                                    :label="dict.label" :value="dict.value">
                                 </el-option>
                             </el-select>
                         </el-form-item>
@@ -335,8 +335,8 @@
                     <el-col :span="12" class="custom-margin">
                         <el-form-item label="证书图片" prop="pictureUrl"
                             :rules="[{ required: true, message: '证书图片不能为空', trigger: 'blur' }]">
-                            <el-upload v-loading="uploadLoading" class="avatar-uploader" action="#" accept="image/*,.pdf"
-                                :show-file-list="false" :on-success="handleAvatarSuccess"
+                            <el-upload v-loading="uploadLoading" class="avatar-uploader" action="#"
+                                accept="image/*,.pdf" :show-file-list="false" :on-success="handleAvatarSuccess"
                                 :before-upload="beforeAvatarUpload" :http-request="uploadImage">
                                 <img v-if="form.pictureUrl" :src="baseUrl + form.pictureUrl"
                                     style="max-width: 100%; max-height: 100%" class="avatar" alt="" />
@@ -408,6 +408,8 @@ export default {
             queryParams: {
                 pageNum: 1,
                 pageSize: 10,
+                orderByColumn: "",
+                isAsc: "asc",
                 sub: null,
                 awardType: null,
                 awardRank: null,
@@ -470,6 +472,23 @@ export default {
         this.getList();
     },
     methods: {
+        //排序列
+        sortChange(data) {
+            console.log(data, 'data');
+            const { prop, order } = data
+            //排序列
+            this.queryParams.orderByColumn = prop;
+            //排序顺序ascending或descending
+            // this.queryParams.isAsc = order;
+            if (order == "ascending") {
+                this.queryParams.isAsc = 'asc';
+            } else {
+                this.queryParams.isAsc = 'desc';
+            }
+            //返回第一页
+            this.queryParams.pageNum = 1;
+            this.getList();
+        },
         /** 查询列表 */
         getList() {
             this.loading = true;
@@ -699,7 +718,7 @@ export default {
     }
 };
 </script>
-<style scoped lang="scss" >
+<style scoped lang="scss">
 .avatar-uploader .el-upload {
     border: 1px dashed #d9d9d9;
     border-radius: 6px;
@@ -760,4 +779,9 @@ export default {
     padding: 0;
 
 }
+
+::v-deep.el-table--border .el-table__cell .cell {
+    padding-left: 0px !important;
+
+}
 </style>

ruoyi-ui/src/views/smartSchool/electronicArchives/professionalDevelopment/teacherAwards/index.vue

@@ -6,8 +6,8 @@
                     <el-col :span="12">
                         <el-form-item label="学科" prop="sub">
                             <el-select v-model="queryParams.sub" clearable placeholder="请选择" style="width: 100%;">
-                                <el-option v-for="dict in dict.type.teaching_subjects" :key="dict.value" :label="dict.label"
-                                    :value="dict.value">
+                                <el-option v-for="dict in dict.type.teaching_subjects" :key="dict.value"
+                                    :label="dict.label" :value="dict.value">
                                 </el-option>
                             </el-select>
                         </el-form-item>
@@ -34,7 +34,8 @@
                     </el-col>
                     <el-col :span="12">
                         <el-form-item label="获奖等级" prop="awardLevel">
-                            <el-select v-model="queryParams.awardLevel" clearable placeholder="请选择" style="width: 100%;">
+                            <el-select v-model="queryParams.awardLevel" clearable placeholder="请选择"
+                                style="width: 100%;">
                                 <el-option v-for="dict in dict.type.award_rank" :key="dict.value" :label="dict.label"
                                     :value="dict.value">
                                 </el-option>
@@ -51,8 +52,8 @@
                     </el-col>
                     <el-col :span="12">
                         <el-form-item label="获奖开始时间" prop="awardTime">
-                            <el-date-picker clearable v-model="queryParams.startTime" type="date" value-format="yyyy-MM-dd"
-                                placeholder="请选择" style="width: 100%;">
+                            <el-date-picker clearable v-model="queryParams.startTime" type="date"
+                                value-format="yyyy-MM-dd" placeholder="请选择" style="width: 100%;">
                             </el-date-picker>
                         </el-form-item>
                     </el-col>
@@ -60,8 +61,8 @@
                 <el-row>
                     <el-col :span="12">
                         <el-form-item label="获奖结束时间" prop="awardTime">
-                            <el-date-picker clearable v-model="queryParams.endTime" type="date" value-format="yyyy-MM-dd"
-                                placeholder="请选择" style="width: 100%;">
+                            <el-date-picker clearable v-model="queryParams.endTime" type="date"
+                                value-format="yyyy-MM-dd" placeholder="请选择" style="width: 100%;">
                             </el-date-picker>
                         </el-form-item>
                     </el-col>
@@ -85,8 +86,8 @@
                     v-hasPermi="['school:teacherAwards:edit']">修改</el-button>
             </el-col>
             <el-col :span="1.5">
-                <el-button type="danger" plain icon="el-icon-delete" size="mini" :disabled="multiple" @click="handleDelete"
-                    v-hasPermi="['school:teacherAwards:remove']">删除</el-button>
+                <el-button type="danger" plain icon="el-icon-delete" size="mini" :disabled="multiple"
+                    @click="handleDelete" v-hasPermi="['school:teacherAwards:remove']">删除</el-button>
             </el-col>
             <el-col :span="1.5">
                 <el-button type="warning" plain icon="el-icon-download" size="mini" @click="handleExport"
@@ -95,7 +96,7 @@
             <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
         </el-row>
 
-        <el-table :row-style="{ height: '1px' }" :cell-style="{ padding: '0px' }"
+        <el-table border :row-style="{ height: '1px' }" :cell-style="{ padding: '0px' }"
             :header-cell-style="{ height: '50px', fontSize: '12px', padding: '0 0' }" :data="awardsList"
             @selection-change="handleSelectionChange" :default-sort="{ prop: 'awardTime', order: 'descending' }">
             <el-table-column type="selection" width="30" align="center" />
@@ -105,7 +106,8 @@
                     <span>教学获奖</span>
                 </template>
             </el-table-column>
-            <el-table-column label="学科" align="center" prop="sub" sortable fixed="left" show-overflow-tooltip width="60px">
+            <el-table-column label="学科" align="center" prop="sub" sortable fixed="left" show-overflow-tooltip
+                width="60px">
                 <template slot-scope="scope">
                     <dict-tag :options="dict.type.teaching_subjects" :value="scope.row.sub" />
                 </template>
@@ -125,11 +127,10 @@
                     <dict-tag :options="dict.type.awards_level" :value="scope.row.awardRank" />
                 </template>
             </el-table-column>
-            <el-table-column label="教学获奖-成果名称" align="center" prop="resultName" sortable width="140px"
-                show-overflow-tooltip />
+            <el-table-column label="教学获奖-成果名称" align="center" prop="resultName" sortable show-overflow-tooltip />
             <el-table-column label="获奖人" align="center" prop="userName" sortable width="80px" show-overflow-tooltip />
             <el-table-column label="主办单位" align="center" prop="org" sortable width="100px" show-overflow-tooltip />
-            <el-table-column label="获奖时间" align="center" prop="awardTime" sortable show-overflow-tooltip>
+            <el-table-column label="获奖时间" align="center" prop="awardTime" sortable width="100px" show-overflow-tooltip>
                 <template slot-scope="scope">
                     <span>{{ parseTime(scope.row.awardTime, '{y}-{m}-{d}') }}</span>
                 </template>
@@ -139,7 +140,8 @@
                     <dict-tag :options="dict.type.audit_states" :value="scope.row.auditState" />
                 </template>
             </el-table-column>
-            <el-table-column label="操作" align="center" class-name="small-padding fixed-width" fixed="right" width="160px">
+            <el-table-column label="操作" align="center" class-name="small-padding fixed-width" fixed="right"
+                width="160px">
                 <template slot-scope="scope">
                     <el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)"
                         v-hasPermi="['school:teacherAwards:edit']"
@@ -153,8 +155,8 @@
             </el-table-column>
         </el-table>
 
-        <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize"
-            @pagination="getList" />
+        <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum"
+            :limit.sync="queryParams.pageSize" @pagination="getList" />
 
         <!-- 添加或修改教师获奖对话框 -->
         <el-dialog :title="title" :visible.sync="open" width="1000px" append-to-body>
@@ -163,8 +165,8 @@
                     <el-col :span="12">
                         <el-form-item label="学科" prop="sub">
                             <el-select v-model="form.sub" clearable placeholder="请选择" style="width: 100%;">
-                                <el-option v-for="dict in dict.type.teaching_subjects" :key="dict.value" :label="dict.label"
-                                    :value="dict.value">
+                                <el-option v-for="dict in dict.type.teaching_subjects" :key="dict.value"
+                                    :label="dict.label" :value="dict.value">
                                 </el-option>
                             </el-select>
                         </el-form-item>
@@ -261,8 +263,8 @@
                     <el-col :span="12">
                         <el-form-item label="学科" prop="sub">
                             <el-select v-model="form.sub" placeholder="请选择" style="width: 100%;">
-                                <el-option v-for="dict in dict.type.teaching_subjects" :key="dict.value" :label="dict.label"
-                                    :value="dict.value">
+                                <el-option v-for="dict in dict.type.teaching_subjects" :key="dict.value"
+                                    :label="dict.label" :value="dict.value">
                                 </el-option>
                             </el-select>
                         </el-form-item>
@@ -690,7 +692,7 @@ export default {
     }
 };
 </script>
-<style scoped lang="scss" >
+<style scoped lang="scss">
 .avatar-uploader .el-upload {
     border: 1px dashed #d9d9d9;
     border-radius: 6px;
@@ -751,4 +753,9 @@ export default {
     padding: 0;
 
 }
+
+::v-deep.el-table--border .el-table__cell .cell {
+    padding-left: 0px !important;
+
+}
 </style>

ruoyi-ui/src/views/smartSchool/electronicArchives/professionalDevelopment/teachingAchievements/index.vue

@@ -144,11 +144,11 @@
             <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
         </el-row>
 
-        <el-table :data="achievementsList" @selection-change="handleSelectionChange"
+        <el-table border :data="achievementsList" @selection-change="handleSelectionChange" @sort-change="sortChange"
             :default-sort="{ prop: 'examTime', order: 'descending' }" :row-style="{ height: '1px' }"
             :cell-style="{ padding: '0px' }" :header-cell-style="{ height: '50px', fontSize: '12px', padding: '0 0' }">
             <el-table-column type="selection" width="30" align="center" />
-            <el-table-column type="index" label="序号" width="30" align="center" sortable />
+            <el-table-column type="index" label="序号" width="30" align="center" sortable fixed="left" />
             <el-table-column label="学年" align="center" prop="schoolYear" sortable fixed="left" width="80px"
                 show-overflow-tooltip />
             <el-table-column label="学期" align="center" prop="semester" sortable fixed="left" width="80px"
@@ -157,7 +157,7 @@
                     <dict-tag :options="dict.type.semester_jsdzda" :value="scope.row.semester" />
                 </template>
             </el-table-column>
-            <el-table-column label="考试时间" align="center" prop="examTime" width="120" sortable show-overflow-tooltip>
+            <el-table-column label="考试时间" align="center" prop="examTime" width="85" sortable show-overflow-tooltip>
                 <template slot-scope="scope">
                     <span>{{ parseTime(scope.row.examTime, '{y}-{m}-{d}') }}</span>
                 </template>
@@ -179,9 +179,9 @@
                     <dict-tag :options="dict.type.teaching_subjects" :value="scope.row.sub" />
                 </template>
             </el-table-column>
-            <el-table-column label="班级" align="center" width="100px" prop="className" sortable show-overflow-tooltip>
+            <el-table-column label="班级" align="center" width="60px" prop="className" sortable show-overflow-tooltip>
             </el-table-column>
-            <el-table-column label="班级类型" align="center" sortable show-overflow-tooltip width="120px">
+            <el-table-column label="班级类型" align="center" sortable show-overflow-tooltip width="80px">
                 <template slot-scope="scope">
                     <span v-if="getSelectedTypes(scope.row.classType).length > 0">
                         <span v-for="(option, index) in getSelectedTypes(scope.row.classType)" :key="index">
@@ -192,10 +192,12 @@
                 </template>
             </el-table-column>
             <!-- 新加  优生增量和常规增量-->
-            <el-table-column label="优生增量" align="center" prop="yszl" sortable show-overflow-tooltip />
-            <el-table-column label="常规增量" align="center" prop="cgzl" sortable show-overflow-tooltip />
-            <el-table-column label="增量分" align="center" prop="assessmentScore" sortable show-overflow-tooltip />
-            <el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="180px"
+            <el-table-column label="常规增量" align="center" prop="cgzl" sortable show-overflow-tooltip width="80px" />
+            <el-table-column label="优生增量" align="center" prop="yszl" sortable show-overflow-tooltip width="80px" />
+            <el-table-column label="增量分" align="center" prop="assessmentScore" sortable show-overflow-tooltip
+                width="70px" />
+            <el-table-column label="备注" align="center" prop="remark" sortable show-overflow-tooltip />
+            <el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="100px"
                 fixed="right">
                 <template slot-scope="scope">
                     <el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)"
@@ -344,13 +346,13 @@
                 </el-row>
                 <el-row>
                     <el-col :span="12">
-                        <el-form-item label="优生增量" prop="yszl">
-                            <el-input v-model="form.yszl" placeholder="请输入优生增量" clearable />
+                        <el-form-item label="常规增量" prop="cgzl">
+                            <el-input v-model="form.cgzl" placeholder="请输入常规增量" clearable />
                         </el-form-item>
                     </el-col>
                     <el-col :span="12">
-                        <el-form-item label="常规增量" prop="cgzl">
-                            <el-input v-model="form.cgzl" placeholder="请输入常规增量" clearable />
+                        <el-form-item label="优生增量" prop="yszl">
+                            <el-input v-model="form.yszl" placeholder="请输入优生增量" clearable />
                         </el-form-item>
                     </el-col>
                 </el-row>
@@ -421,6 +423,8 @@ export default {
             queryParams: {
                 pageNum: 1,
                 pageSize: 10,
+                orderByColumn: "",
+                isAsc: "asc",
                 userName: "",
                 schoolYear: "",
                 semester: "",
@@ -483,6 +487,23 @@ export default {
         this.getList();
     },
     methods: {
+        //排序列
+        sortChange(data) {
+            console.log(data, 'data');
+            const { prop, order } = data
+            //排序列
+            this.queryParams.orderByColumn = prop;
+            //排序顺序ascending或descending
+            // this.queryParams.isAsc = order;
+            if (order == "ascending") {
+                this.queryParams.isAsc = 'asc';
+            } else {
+                this.queryParams.isAsc = 'desc';
+            }
+            //返回第一页
+            this.queryParams.pageNum = 1;
+            this.getList();
+        },
         /** 查询教学成绩列表 */
         getList() {
             this.loading = true;
@@ -709,4 +730,14 @@ export default {
     padding: 0;
 
 }
+
+::v-deep.el-table--border .el-table__cell .cell {
+    padding-left: 0px !important;
+
+}
+
+::v-deep.el-table--border .el-table__cell .cell {
+    padding-left: 0px !important;
+
+}
 </style>
\ No newline at end of file

ruoyi-ui/src/views/smartSchool/electronicArchives/professionalDevelopment/teamAward/index.vue

@@ -5,7 +5,8 @@
                 <el-row>
                     <el-col :span="12">
                         <el-form-item label="学年" prop="schoolYear">
-                            <el-select v-model="queryParams.schoolYear" clearable placeholder="请选择" style="width: 100%;">
+                            <el-select v-model="queryParams.schoolYear" clearable placeholder="请选择"
+                                style="width: 100%;">
                                 <el-option v-for=" dict in dict.type.yearda" :key="dict.value" :label="dict.label"
                                     :value="dict.value">
                                 </el-option>
@@ -15,8 +16,8 @@
                     <el-col :span="12">
                         <el-form-item label="学期" prop="semester">
                             <el-select v-model="queryParams.semester" clearable placeholder="请选择" style="width: 100%;">
-                                <el-option v-for="dict in dict.type.semester_jsdzda" :key="dict.value" :label="dict.label"
-                                    :value="dict.value">
+                                <el-option v-for="dict in dict.type.semester_jsdzda" :key="dict.value"
+                                    :label="dict.label" :value="dict.value">
                                 </el-option>
                             </el-select>
                         </el-form-item>
@@ -46,8 +47,8 @@
                     <el-col :span="12">
                         <el-form-item label="学科" prop="sub">
                             <el-select v-model="queryParams.sub" clearable placeholder="请选择" style="width: 100%;">
-                                <el-option v-for="dict in dict.type.teaching_subjects" :key="dict.value" :label="dict.label"
-                                    :value="dict.value">
+                                <el-option v-for="dict in dict.type.teaching_subjects" :key="dict.value"
+                                    :label="dict.label" :value="dict.value">
                                 </el-option>
                             </el-select>
                         </el-form-item>
@@ -72,8 +73,8 @@
                     v-hasPermi="['system:award:edit']">修改</el-button>
             </el-col>
             <el-col :span="1.5">
-                <el-button type="danger" plain icon="el-icon-delete" size="mini" :disabled="multiple" @click="handleDelete"
-                    v-hasPermi="['system:award:remove']">删除</el-button>
+                <el-button type="danger" plain icon="el-icon-delete" size="mini" :disabled="multiple"
+                    @click="handleDelete" v-hasPermi="['system:award:remove']">删除</el-button>
             </el-col>
             <el-col :span="1.5">
                 <el-button type="warning" plain icon="el-icon-download" size="mini" @click="handleExport"
@@ -82,9 +83,10 @@
             <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
         </el-row>
 
-        <el-table :row-style="{ height: '1px' }" :cell-style="{ padding: '0px' }"
-            :header-cell-style="{ height: '50px', fontSize: '12px', padding: '0 0' }" v-loading="loading" :data="awardList"
-            @selection-change="handleSelectionChange" :default-sort="{ prop: 'schoolYear', order: 'descending' }">
+        <el-table border :row-style="{ height: '1px' }" :cell-style="{ padding: '0px' }" @sort-change="sortChange"
+            :header-cell-style="{ height: '50px', fontSize: '12px', padding: '0 0' }" v-loading="loading"
+            :data="awardList" @selection-change="handleSelectionChange"
+            :default-sort="{ prop: 'schoolYear', order: 'descending' }">
             <el-table-column type="selection" width="30" align="center" />
             <el-table-column type="index" label="序号" width="30" align="center" sortable fixed="left" />
             <el-table-column label="学年" align="center" prop="schoolYear" sortable fixed="left" width="80px"
@@ -110,11 +112,10 @@
                     <dict-tag :options="dict.type.teaching_subjects" :value="scope.row.sub" />
                 </template>
             </el-table-column>
-            <el-table-column label="获奖情况" align="center" prop="awardSituation" sortable show-overflow-tooltip
-                width="160px" />
-            <el-table-column label="团队成员贡献情况" align="center" prop="teamMembersContribution" sortable width="160px"
+            <el-table-column label="获奖情况" align="center" prop="awardSituation" sortable show-overflow-tooltip />
+            <el-table-column label="团队成员贡献情况" align="center" prop="teamMembersContribution" sortable
                 show-overflow-tooltip />
-            <el-table-column label="备注" align="center" prop="remark" sortable show-overflow-tooltip />
+            <el-table-column label="备注" align="center" prop="remark" sortable width="90" show-overflow-tooltip />
             <el-table-column label="审核状态" align="center" prop="auditState" sortable width="80" fixed="right">
                 <template slot-scope="scope">
                     <dict-tag :options="dict.type.audit_states" :value="scope.row.auditState" />
@@ -122,7 +123,8 @@
             </el-table-column>
             <el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="150" fixed="right">
                 <template slot-scope="scope">
-                    <el-button size="mini" type="text" @click="handleUpdate(scope.row)" v-hasPermi="['system:honors:edit']"
+                    <el-button size="mini" type="text" @click="handleUpdate(scope.row)"
+                        v-hasPermi="['system:honors:edit']"
                         v-if="scope.row.auditState === '1' || scope.row.auditState === '2' || scope.row.auditState === '3'">修改</el-button>
                     <el-button size="mini" type="text" @click="handleDelete(scope.row)"
                         v-hasPermi="['system:honors:remove']"
@@ -133,8 +135,8 @@
             </el-table-column>
         </el-table>
 
-        <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize"
-            @pagination="getList" />
+        <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum"
+            :limit.sync="queryParams.pageSize" @pagination="getList" />
 
         <!-- 添加或修改团队获奖对话框 -->
         <el-dialog :title="title" :visible.sync="open" width="900px" append-to-body>
@@ -152,8 +154,8 @@
                     <el-col :span="12">
                         <el-form-item label="学期" prop="semester">
                             <el-select v-model="form.semester" clearable placeholder="请选择" style="width: 100%;">
-                                <el-option v-for="dict in dict.type.semester_jsdzda" :key="dict.value" :label="dict.label"
-                                    :value="dict.value">
+                                <el-option v-for="dict in dict.type.semester_jsdzda" :key="dict.value"
+                                    :label="dict.label" :value="dict.value">
                                 </el-option>
                             </el-select>
                         </el-form-item>
@@ -183,8 +185,8 @@
                     <el-col :span="12">
                         <el-form-item label="学科" prop="sub">
                             <el-select v-model="form.sub" clearable placeholder="请选择" style="width: 100%;">
-                                <el-option v-for="dict in dict.type.teaching_subjects" :key="dict.value" :label="dict.label"
-                                    :value="dict.value">
+                                <el-option v-for="dict in dict.type.teaching_subjects" :key="dict.value"
+                                    :label="dict.label" :value="dict.value">
                                 </el-option>
                             </el-select>
                         </el-form-item>
@@ -230,8 +232,8 @@
                     <el-col :span="12">
                         <el-form-item label="学期" prop="semester">
                             <el-select v-model="form.semester" placeholder="请选择" style="width: 100%;">
-                                <el-option v-for="dict in dict.type.semester_jsdzda" :key="dict.value" :label="dict.label"
-                                    :value="dict.value">
+                                <el-option v-for="dict in dict.type.semester_jsdzda" :key="dict.value"
+                                    :label="dict.label" :value="dict.value">
                                 </el-option>
                             </el-select>
                         </el-form-item>
@@ -261,8 +263,8 @@
                     <el-col :span="12">
                         <el-form-item label="学科" prop="sub">
                             <el-select v-model="form.sub" placeholder="请选择" style="width: 100%;">
-                                <el-option v-for="dict in dict.type.teaching_subjects" :key="dict.value" :label="dict.label"
-                                    :value="dict.value">
+                                <el-option v-for="dict in dict.type.teaching_subjects" :key="dict.value"
+                                    :label="dict.label" :value="dict.value">
                                 </el-option>
                             </el-select>
                         </el-form-item>
@@ -326,6 +328,8 @@ export default {
             queryParams: {
                 pageNum: 1,
                 pageSize: 10,
+                orderByColumn: "",
+                isAsc: "asc",
                 schoolYear: null,
                 semester: null,
                 year: null,
@@ -367,6 +371,23 @@ export default {
         this.getList();
     },
     methods: {
+        //排序列
+        sortChange(data) {
+            console.log(data, 'data');
+            const { prop, order } = data
+            //排序列
+            this.queryParams.orderByColumn = prop;
+            //排序顺序ascending或descending
+            // this.queryParams.isAsc = order;
+            if (order == "ascending") {
+                this.queryParams.isAsc = 'asc';
+            } else {
+                this.queryParams.isAsc = 'desc';
+            }
+            //返回第一页
+            this.queryParams.pageNum = 1;
+            this.getList();
+        },
         /** 查询团队获奖列表 */
         getList() {
             this.loading = true;
@@ -557,4 +578,9 @@ export default {
     padding: 0;
 
 }
+
+::v-deep.el-table--border .el-table__cell .cell {
+    padding-left: 0px !important;
+
+}
 </style>
\ No newline at end of file

ruoyi-ui/src/views/smartSchool/electronicArchives/professionalDevelopment/tutorAward/index.vue

@@ -6,8 +6,8 @@
                     <el-col :span="12">
                         <el-form-item label="学科" prop="sub">
                             <el-select v-model="queryParams.sub" clearable placeholder="请选择" style="width: 100%;">
-                                <el-option v-for="dict in dict.type.teaching_subjects" :key="dict.value" :label="dict.label"
-                                    :value="dict.value">
+                                <el-option v-for="dict in dict.type.teaching_subjects" :key="dict.value"
+                                    :label="dict.label" :value="dict.value">
                                 </el-option>
                             </el-select>
                         </el-form-item>
@@ -15,8 +15,8 @@
                     <el-col :span="12">
                         <el-form-item label="获奖类别" prop="awardtype">
                             <el-select v-model="queryParams.awardtype" clearable placeholder="请选择" style="width: 100%;">
-                                <el-option v-for="dict in dict.type.award_type_fdjs" :key="dict.value" :label="dict.label"
-                                    :value="dict.value">
+                                <el-option v-for="dict in dict.type.award_type_fdjs" :key="dict.value"
+                                    :label="dict.label" :value="dict.value">
                                 </el-option>
                             </el-select>
                         </el-form-item>
@@ -34,7 +34,8 @@
                     </el-col>
                     <el-col :span="12">
                         <el-form-item label="获奖等级" prop="awardlevel">
-                            <el-select v-model="queryParams.awardlevel" clearable placeholder="请选择" style="width: 100%;">
+                            <el-select v-model="queryParams.awardlevel" clearable placeholder="请选择"
+                                style="width: 100%;">
                                 <el-option v-for="dict in dict.type.award_rank" :key="dict.value" :label="dict.label"
                                     :value="dict.value">
                                 </el-option>
@@ -67,8 +68,8 @@
                     </el-col>
                     <el-col :span="12">
                         <el-form-item label="获奖开始时间" prop="startTime">
-                            <el-date-picker clearable v-model="queryParams.startTime" type="date" value-format="yyyy-MM-dd"
-                                placeholder="请选择" style="width: 100%;">
+                            <el-date-picker clearable v-model="queryParams.startTime" type="date"
+                                value-format="yyyy-MM-dd" placeholder="请选择" style="width: 100%;">
                             </el-date-picker>
                         </el-form-item>
                     </el-col>
@@ -76,8 +77,8 @@
                 <el-row>
                     <el-col :span="12">
                         <el-form-item label="获奖结束时间" prop="endTime">
-                            <el-date-picker clearable v-model="queryParams.endTime" type="date" value-format="yyyy-MM-dd"
-                                placeholder="请选择" style="width: 100%;">
+                            <el-date-picker clearable v-model="queryParams.endTime" type="date"
+                                value-format="yyyy-MM-dd" placeholder="请选择" style="width: 100%;">
                             </el-date-picker>
                         </el-form-item>
                     </el-col>
@@ -101,8 +102,8 @@
                     v-hasPermi="['school:fudaot:edit']">修改</el-button>
             </el-col>
             <el-col :span="1.5">
-                <el-button type="danger" plain icon="el-icon-delete" size="mini" :disabled="multiple" @click="handleDelete"
-                    v-hasPermi="['school:fudaot:delete']">删除</el-button>
+                <el-button type="danger" plain icon="el-icon-delete" size="mini" :disabled="multiple"
+                    @click="handleDelete" v-hasPermi="['school:fudaot:delete']">删除</el-button>
             </el-col>
             <el-col :span="1.5">
                 <el-button type="warning" plain icon="el-icon-download" size="mini" @click="handleExport"
@@ -111,7 +112,7 @@
             <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
         </el-row>
 
-        <el-table :row-style="{ height: '1px' }" :cell-style="{ padding: '0px' }"
+        <el-table border :row-style="{ height: '1px' }" :cell-style="{ padding: '0px' }" @sort-change="sortChange"
             :header-cell-style="{ height: '50px', fontSize: '12px', padding: '0 0' }" :data="awardsList"
             @selection-change="handleSelectionChange" :default-sort="{ prop: 'awardtime', order: 'descending' }">
             <el-table-column type="selection" width="30" align="center" />
@@ -121,30 +122,31 @@
                     <span>辅导老师获奖</span>
                 </template>
             </el-table-column>
-            <el-table-column label="学科" align="center" prop="sub" sortable fixed="left" width="50px" show-overflow-tooltip>
+            <el-table-column label="学科" align="center" prop="sub" sortable fixed="left" width="50px"
+                show-overflow-tooltip>
                 <template slot-scope="scope">
                     <dict-tag :options="dict.type.teaching_subjects" :value="scope.row.sub" />
                 </template>
             </el-table-column>
-            <el-table-column label="获奖类别" align="center" prop="awardtype" sortable width="100px" show-overflow-tooltip>
+            <el-table-column label="获奖类别" align="center" prop="awardtype" sortable width="95px" show-overflow-tooltip>
                 <template slot-scope="scope">
                     <dict-tag :options="dict.type.award_type_fdjs" :value="scope.row.awardtype" />
                 </template>
             </el-table-column>
-            <el-table-column label="获奖等级" align="center" prop="awardlevel" sortable width="80px" show-overflow-tooltip>
+            <el-table-column label="获奖等级" align="center" prop="awardlevel" sortable width="95px" show-overflow-tooltip>
                 <template slot-scope="scope">
                     <dict-tag :options="dict.type.award_rank" :value="scope.row.awardlevel" />
                 </template>
             </el-table-column>
-            <el-table-column label="获奖级别" align="center" prop="awardrank" sortable width="80px" show-overflow-tooltip>
+            <el-table-column label="获奖级别" align="center" prop="awardrank" sortable width="95px" show-overflow-tooltip>
                 <template slot-scope="scope">
                     <dict-tag :options="dict.type.awards_level" :value="scope.row.awardrank" />
                 </template>
             </el-table-column>
-            <el-table-column label="比赛名称" align="center" prop="competitionname" sortable width="130px"
+            <el-table-column label="比赛名称" align="center" prop="competitionname" sortable="competition_name"
                 show-overflow-tooltip />
             <el-table-column label="获奖人" align="center" prop="username" sortable width="70px" show-overflow-tooltip />
-            <el-table-column label="指导教师" align="center" prop="guidanceteacher" sortable width="80px"
+            <el-table-column label="指导教师" align="center" prop="guidanceteacher" sortable width="95px"
                 show-overflow-tooltip />
             <el-table-column label="辅导职责" align="center" prop="coachingr" sortable width="90px" show-overflow-tooltip>
                 <template slot-scope="scope">
@@ -152,17 +154,18 @@
                 </template>
             </el-table-column>
             <el-table-column label="主办单位" align="center" prop="org" sortable width="100px" show-overflow-tooltip />
-            <el-table-column label="获奖时间" align="center" prop="awardtime" sortable show-overflow-tooltip>
+            <el-table-column label="获奖时间" align="center" prop="awardtime" width="100px" sortable show-overflow-tooltip>
                 <!-- <template slot-scope="scope">
                     <span>{{ parseTime(scope.row.awardTime, '{y}-{m}-{d}') }}</span>
                 </template> -->
             </el-table-column>
-            <el-table-column label="审核状态" align="center" prop="auditstate" sortable width="80" fixed="right">
+            <el-table-column label="审核状态" align="center" prop="auditstate" sortable width="50" fixed="right">
                 <template slot-scope="scope">
                     <dict-tag :options="dict.type.audit_states" :value="scope.row.auditstate" />
                 </template>
             </el-table-column>
-            <el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="160px" fixed="right">
+            <el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="160px"
+                fixed="right">
                 <template slot-scope="scope">
                     <el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)"
                         v-hasPermi="['school:fudaot:edit']"
@@ -175,8 +178,8 @@
                 </template>
             </el-table-column>
         </el-table>
-        <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize"
-            @pagination="getList" />
+        <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum"
+            :limit.sync="queryParams.pageSize" @pagination="getList" />
 
         <!-- 添加或修改教师获奖对话框 -->
         <el-dialog :title="title" :visible.sync="open" width="1000px" append-to-body>
@@ -185,8 +188,8 @@
                     <el-col :span="12">
                         <el-form-item label="学科" prop="sub">
                             <el-select v-model="form.sub" clearable placeholder="请选择" style="width: 100%;">
-                                <el-option v-for="dict in dict.type.teaching_subjects" :key="dict.value" :label="dict.label"
-                                    :value="dict.value">
+                                <el-option v-for="dict in dict.type.teaching_subjects" :key="dict.value"
+                                    :label="dict.label" :value="dict.value">
                                 </el-option>
                             </el-select>
                         </el-form-item>
@@ -194,8 +197,8 @@
                     <el-col :span="12">
                         <el-form-item label="获奖类别" prop="awardtype">
                             <el-select v-model="form.awardtype" clearable placeholder="请选择" style="width: 100%;">
-                                <el-option v-for="dict in dict.type.award_type_fdjs" :key="dict.value" :label="dict.label"
-                                    :value="dict.value">
+                                <el-option v-for="dict in dict.type.award_type_fdjs" :key="dict.value"
+                                    :label="dict.label" :value="dict.value">
                                 </el-option>
                             </el-select>
                         </el-form-item>
@@ -300,8 +303,8 @@
                     <el-col :span="12">
                         <el-form-item label="学科" prop="sub">
                             <el-select v-model="form.sub" placeholder="请选择" style="width: 100%;">
-                                <el-option v-for="dict in dict.type.teaching_subjects" :key="dict.value" :label="dict.label"
-                                    :value="dict.value">
+                                <el-option v-for="dict in dict.type.teaching_subjects" :key="dict.value"
+                                    :label="dict.label" :value="dict.value">
                                 </el-option>
                             </el-select>
                         </el-form-item>
@@ -309,8 +312,8 @@
                     <el-col :span="12">
                         <el-form-item label="获奖类别" prop="awardtype">
                             <el-select v-model="form.awardtype" placeholder="请选择" style="width: 100%;">
-                                <el-option v-for="dict in dict.type.award_type_fdjs" :key="dict.value" :label="dict.label"
-                                    :value="dict.value">
+                                <el-option v-for="dict in dict.type.award_type_fdjs" :key="dict.value"
+                                    :label="dict.label" :value="dict.value">
                                 </el-option>
                             </el-select>
                         </el-form-item>
@@ -481,6 +484,8 @@ export default {
             queryParams: {
                 pageNum: 1,
                 pageSize: 10,
+                orderByColumn: "",
+                isAsc: "asc",
                 sub: null,
                 awardType: null,
                 awardRank: null,
@@ -539,6 +544,51 @@ export default {
         this.getList();
     },
     methods: {
+        //排序列
+        sortChange(data) {
+            console.log(data, 'data');
+            const { prop, order } = data
+            //排序列
+            // this.queryParams.orderByColumn = prop;
+            if (prop == 'awardtype') {
+                this.queryParams.orderByColumn = 'award_type'
+            }
+            if (prop == 'awardrank') {
+                this.queryParams.orderByColumn = 'award_rank'
+            }
+            if (prop == 'awardlevel') {
+                this.queryParams.orderByColumn = 'award_level'
+            }
+            if (prop == 'competitionname') {
+                this.queryParams.orderByColumn = 'competition_name'
+            }
+            if (prop == 'guidanceteacher') {
+                this.queryParams.orderByColumn = 'guidance_teacher'
+            }
+            if (prop == 'username') {
+                this.queryParams.orderByColumn = 'user_name'
+            }
+            if (prop == 'coachingr') {
+                this.queryParams.orderByColumn = ' coaching_responsibilities'
+            }
+            if (prop == 'awardtime') {
+                this.queryParams.orderByColumn = 'award_time'
+            }
+            if (prop == 'auditstate') {
+                this.queryParams.orderByColumn = 'audit_state'
+            }
+
+            //排序顺序ascending或descending
+            // this.queryParams.isAsc = order;
+            if (order == "ascending") {
+                this.queryParams.isAsc = 'asc';
+            } else {
+                this.queryParams.isAsc = 'desc';
+            }
+            //返回第一页
+            this.queryParams.pageNum = 1;
+            this.getList();
+        },
         /** 查询教师获奖列表 */
         getList() {
             this.loading = true;
@@ -765,7 +815,7 @@ export default {
     }
 };
 </script>
-<style scoped lang="scss" >
+<style scoped lang="scss">
 .avatar-uploader .el-upload {
     border: 1px dashed #d9d9d9;
     border-radius: 6px;
@@ -826,4 +876,9 @@ export default {
     padding: 0;
 
 }
+
+::v-deep.el-table--border .el-table__cell .cell {
+    padding-left: 0px !important;
+
+}
 </style>

ruoyi-ui/src/views/smartSchool/electronicArchives/teacherAssessment/index.vue

@@ -11,7 +11,8 @@
                     </el-col>
                     <el-col :span="12">
                         <el-form-item label="学年" prop="schoolYear">
-                            <el-select v-model="queryParams.schoolYear" clearable placeholder="请选择" style="width: 100%;">
+                            <el-select v-model="queryParams.schoolYear" clearable placeholder="请选择"
+                                style="width: 100%;">
                                 <el-option v-for="dict in dict.type.yearda" :key="dict.value" :label="dict.label"
                                     :value="dict.value">
                                 </el-option>
@@ -31,8 +32,8 @@
                     <el-col :span="12">
                         <el-form-item label="学期" prop="semester">
                             <el-select v-model="queryParams.semester" clearable placeholder="请选择" style="width: 100%;">
-                                <el-option v-for="dict in dict.type.semester_jsdzda" :key="dict.value" :label="dict.label"
-                                    :value="dict.value">
+                                <el-option v-for="dict in dict.type.semester_jsdzda" :key="dict.value"
+                                    :label="dict.label" :value="dict.value">
                                 </el-option>
                             </el-select>
                         </el-form-item>
@@ -51,8 +52,8 @@
                     <el-col :span="12">
                         <el-form-item label="学科" prop="sub">
                             <el-select v-model="queryParams.sub" clearable placeholder="请选择" style="width: 100%">
-                                <el-option v-for="dict in dict.type.teaching_subjects" :key="dict.value" :label="dict.label"
-                                    :value="dict.value">
+                                <el-option v-for="dict in dict.type.teaching_subjects" :key="dict.value"
+                                    :label="dict.label" :value="dict.value">
                                 </el-option>
                             </el-select>
                         </el-form-item>
@@ -108,8 +109,8 @@
                     v-hasPermi="['system:assessment:edit']">修改</el-button>
             </el-col>
             <el-col :span="1.5">
-                <el-button type="danger" plain icon="el-icon-delete" size="mini" :disabled="multiple" @click="handleDelete"
-                    v-hasPermi="['system:assessment:remove']">删除</el-button>
+                <el-button type="danger" plain icon="el-icon-delete" size="mini" :disabled="multiple"
+                    @click="handleDelete" v-hasPermi="['system:assessment:remove']">删除</el-button>
             </el-col>
             <el-col :span="1.5">
                 <el-button type="success" plain icon="el-icon-upload" size="mini" @click="handleImport"
@@ -122,12 +123,11 @@
             </el-col>
             <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
         </el-row>
-        <el-table :data="assessmentList" @selection-change="handleSelectionChange"
+        <el-table border :data="assessmentList" @selection-change="handleSelectionChange" @sort-change="sortChange"
             :default-sort="{ prop: 'schoolYear', order: 'descending' }" :row-style="{ height: '1px' }"
             :cell-style="{ padding: '0px' }" :header-cell-style="{ height: '50px', fontSize: '12px', padding: '0 0' }">
             <el-table-column type="selection" width="30" align="center" />
-            <el-table-column type="index" label="序号" width="30" align="center" sortable fixed="left"
-                show-overflow-tooltip />
+            <el-table-column type="index" label="序号" width="30" align="center" sortable fixed="left" />
             <el-table-column label="学年" align="center" prop="schoolYear" sortable fixed="left" width="80px
             " show-overflow-tooltip />
             <el-table-column label="学期" align="center" prop="semester" sortable fixed="left" width="80px"
@@ -136,13 +136,13 @@
                     <dict-tag :options="dict.type.semester_jsdzda" :value="scope.row.semester" />
                 </template>
             </el-table-column>
-            <el-table-column label="届别" align="center" prop="year" sortable show-overflow-tooltip width="70px" />
+            <el-table-column label="届别" align="center" prop="year" sortable show-overflow-tooltip width="60px" />
             <el-table-column label="年级" align="center" prop="grade" sortable show-overflow-tooltip width="60px">
                 <template slot-scope="scope">
                     <dict-tag :options="dict.type.grade_da" :value="scope.row.grade" />
                 </template>
             </el-table-column>
-            <el-table-column label="班级" align="center" prop="className" sortable show-overflow-tooltip width="70px" />
+            <el-table-column label="班级" align="center" prop="className" sortable show-overflow-tooltip width="60px" />
             <el-table-column label="班级类型" align="center" prop="classType" sortable width="90px" show-overflow-tooltip>
                 <template slot-scope="scope">
                     <span v-if="getSelectedTypes(scope.row.classType).length > 0">
@@ -153,17 +153,17 @@
                     </span>
                 </template>
             </el-table-column>
-            <el-table-column label="姓名" align="center" prop="teacherName" sortable show-overflow-tooltip width="90px" />
-            <el-table-column label="学科" align="center" prop="sub" sortable show-overflow-tooltip width="80px">
+            <el-table-column label="姓名" align="center" prop="teacherName" sortable show-overflow-tooltip width="75px" />
+            <el-table-column label="学科" align="center" prop="sub" sortable show-overflow-tooltip width="70px">
                 <template slot-scope="scope">
                     <dict-tag :options="dict.type.teaching_subjects" :value="scope.row.sub" />
                 </template>
             </el-table-column>
-            <el-table-column label="德育考核成绩" align="center" prop="moralEduCheckAchievement" sortable width="110px"
+            <el-table-column label="德育考核成绩" align="center" prop="moralEduCheckAchievement" sortable width="60px"
                 show-overflow-tooltip />
-            <el-table-column label="智育考核成绩" align="center" prop="intellEduCheckAchievement" sortable width="110px"
+            <el-table-column label="智育考核成绩" align="center" prop="intellEduCheckAchievement" sortable width="60px"
                 show-overflow-tooltip />
-            <el-table-column label="考核结果" align="center" prop="assessmentResults" sortable width="130px">
+            <el-table-column label="考核结果" align="center" prop="assessmentResults" sortable width="80px">
                 <template slot-scope="scope">
                     <dict-tag :options="dict.type.assessment_results" :value="scope.row.assessmentResults" />
                 </template>
@@ -171,7 +171,8 @@
             <!-- <el-table-column label="总考核成绩" align="center" prop="totalCheckAchievement" sortable fixed="right"
                 width="130px" /> -->
             <el-table-column label="备注" align="center" prop="remark" sortable show-overflow-tooltip />
-            <el-table-column label="操作" align="center" class-name="small-padding fixed-width" fixed="right" width="150px">
+            <el-table-column label="操作" align="center" class-name="small-padding fixed-width" fixed="right"
+                width="150px">
                 <template slot-scope="scope">
                     <el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)"
                         v-hasPermi="['system:assessment:edit']">修改</el-button>
@@ -180,8 +181,8 @@
                 </template>
             </el-table-column>
         </el-table>
-        <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize"
-            @pagination="getList" />
+        <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum"
+            :limit.sync="queryParams.pageSize" @pagination="getList" />
 
         <!-- 添加或修改班主任考核对话框 -->
         <el-dialog :title="title" :visible.sync="open" width="800px" append-to-body>
@@ -190,8 +191,8 @@
                     <el-col :span="12">
                         <el-form-item label="学期" prop="semester">
                             <el-select v-model="form.semester" clearable placeholder="请选择" style="width: 100%;">
-                                <el-option v-for="dict in dict.type.semester_jsdzda" :key="dict.value" :label="dict.label"
-                                    :value="dict.value">
+                                <el-option v-for="dict in dict.type.semester_jsdzda" :key="dict.value"
+                                    :label="dict.label" :value="dict.value">
                                 </el-option>
                             </el-select>
                         </el-form-item>
@@ -251,7 +252,8 @@
                     </el-col>
                     <el-col :span="12">
                         <el-form-item label="德育考核成绩" prop="moralEduCheckAchievement">
-                            <el-input v-model="form.moralEduCheckAchievement" type="number" placeholder="请输入" clearable />
+                            <el-input v-model="form.moralEduCheckAchievement" type="number" placeholder="请输入"
+                                clearable />
                         </el-form-item>
                     </el-col>
                 </el-row>
@@ -259,12 +261,14 @@
                 <el-row>
                     <el-col :span="12">
                         <el-form-item label="智育考核成绩" prop="intellEduCheckAchievement">
-                            <el-input v-model="form.intellEduCheckAchievement" type="number" placeholder="请输入" clearable />
+                            <el-input v-model="form.intellEduCheckAchievement" type="number" placeholder="请输入"
+                                clearable />
                         </el-form-item>
                     </el-col>
                     <el-col :span="12">
                         <el-form-item label="考核结果" prop="assessmentResults">
-                            <el-select v-model="form.assessmentResults" clearable placeholder="请选择" style="width: 100%;">
+                            <el-select v-model="form.assessmentResults" clearable placeholder="请选择"
+                                style="width: 100%;">
                                 <el-option v-for="dict in dict.type.assessment_results" :key="dict.value"
                                     :label="dict.label" :value="dict.value">
                                 </el-option>
@@ -289,8 +293,8 @@
                     <el-col :span="12">
                         <el-form-item label="学科" prop="sub">
                             <el-select v-model="form.sub" placeholder="请选择" clearable style="width: 100%">
-                                <el-option v-for="dict in dict.type.teaching_subjects" :key="dict.value" :label="dict.label"
-                                    :value="dict.value">
+                                <el-option v-for="dict in dict.type.teaching_subjects" :key="dict.value"
+                                    :label="dict.label" :value="dict.value">
                                 </el-option>
                             </el-select>
                         </el-form-item>
@@ -315,7 +319,8 @@
                 <el-form-item prop="dataUrl">
                     <el-upload ref="upload" :limit="1" accept=".xlsx, .xls" :headers="upload.headers"
                         :action="upload.url + '?updateSupport=' + upload.updateSupport" :disabled="upload.isUploading"
-                        :on-progress="handleFileUploadProgress" :on-success="handleFileSuccess" :auto-upload="false" drag>
+                        :on-progress="handleFileUploadProgress" :on-success="handleFileSuccess" :auto-upload="false"
+                        drag>
                         <i class="el-icon-upload"></i>
                         <div class="el-upload__text">
                             将文件拖到此处，或<em>点击上传</em>
@@ -392,6 +397,8 @@ export default {
             queryParams: {
                 pageNum: 1,
                 pageSize: 10,
+                orderByColumn: "",
+                isAsc: "asc",
                 semester: null,
                 year: null,
                 schoolYear: null,
@@ -456,6 +463,23 @@ export default {
         this.getList();
     },
     methods: {
+        //排序列
+        sortChange(data) {
+            console.log(data, 'data');
+            const { prop, order } = data
+            //排序列
+            this.queryParams.orderByColumn = prop;
+            //排序顺序ascending或descending
+            // this.queryParams.isAsc = order;
+            if (order == "ascending") {
+                this.queryParams.isAsc = 'asc';
+            } else {
+                this.queryParams.isAsc = 'desc';
+            }
+            //返回第一页
+            this.queryParams.pageNum = 1;
+            this.getList();
+        },
         /** 查询班主任考核列表 */
         getList() {
             this.loading = true;
@@ -671,4 +695,9 @@ export default {
     padding: 0;
 
 }
+
+::v-deep.el-table--border .el-table__cell .cell {
+    padding-left: 0px !important;
+
+}
 </style>
\ No newline at end of file

ruoyi-ui/src/views/smartSchool/electronicArchives/workloadInformation/index.vue

@@ -11,7 +11,8 @@
                     </el-col>
                     <el-col :span="12">
                         <el-form-item label="学年" prop="schoolYear">
-                            <el-select v-model="queryParams.schoolYear" clearable placeholder="请选择" style="width: 100%;">
+                            <el-select v-model="queryParams.schoolYear" clearable placeholder="请选择"
+                                style="width: 100%;">
                                 <el-option v-for="dict in dict.type.yearda" :key="dict.value" :label="dict.label"
                                     :value="dict.value">
                                 </el-option>
@@ -23,8 +24,8 @@
                     <el-col :span="12">
                         <el-form-item label="学期" prop="semester">
                             <el-select v-model="queryParams.semster" clearable placeholder="请选择" style="width: 100%;">
-                                <el-option v-for="dict in dict.type.semester_jsdzda" :key="dict.value" :label="dict.label"
-                                    :value="dict.value">
+                                <el-option v-for="dict in dict.type.semester_jsdzda" :key="dict.value"
+                                    :label="dict.label" :value="dict.value">
                                 </el-option>
                             </el-select>
                         </el-form-item>
@@ -52,8 +53,8 @@
                     <el-col :span="12">
                         <el-form-item label="学科" prop="sub">
                             <el-select v-model="queryParams.sub" clearable placeholder="请选择" style="width: 100%">
-                                <el-option v-for="dict in dict.type.teaching_subjects" :key="dict.value" :label="dict.label"
-                                    :value="dict.value">
+                                <el-option v-for="dict in dict.type.teaching_subjects" :key="dict.value"
+                                    :label="dict.label" :value="dict.value">
                                 </el-option>
                             </el-select>
                         </el-form-item>
@@ -131,8 +132,8 @@
                     v-hasPermi="['system:aworkload:edit']">修改</el-button>
             </el-col>
             <el-col :span="1.5">
-                <el-button type="danger" plain icon="el-icon-delete" size="mini" :disabled="multiple" @click="handleDelete"
-                    v-hasPermi="['system:aworkload:remove']">删除</el-button>
+                <el-button type="danger" plain icon="el-icon-delete" size="mini" :disabled="multiple"
+                    @click="handleDelete" v-hasPermi="['system:aworkload:remove']">删除</el-button>
             </el-col>
             <el-button type="success" plain icon="el-icon-upload" size="mini" @click="handleImport"
                 v-hasPermi="['system:student:import']">导入
@@ -144,20 +145,20 @@
             <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
         </el-row>
 
-        <el-table :data="aworkloadList" @selection-change="handleSelectionChange"
+        <el-table border :data="aworkloadList" @selection-change="handleSelectionChange" @sort-change="sortChange"
             :default-sort="{ prop: 'schoolYear', order: 'descending' }" :row-style="{ height: '1px' }"
             :cell-style="{ padding: '0px' }" :header-cell-style="{ height: '50px', fontSize: '12px', padding: '0 0' }">
             <el-table-column type="selection" width="30" align="center" />
             <el-table-column type="index" label="序号" width="30" align="center" sortable fixed="left" />
-            <el-table-column label="学年" align="center" prop="schoolYear" width="80px" fixed="left" sortable
+            <el-table-column label="学年" align="center" prop="schoolYear" width="75px" fixed="left" sortable
                 show-overflow-tooltip />
-            <el-table-column label="学期" align="center" prop="semester" fixed="left" sortable width="80px"
+            <el-table-column label="学期" align="center" prop="semester" fixed="left" sortable width="75px"
                 show-overflow-tooltip>
                 <template slot-scope="scope">
                     <dict-tag :options="dict.type.semester_jsdzda" :value="scope.row.semester" />
                 </template>
             </el-table-column>
-            <el-table-column label="届别" align="center" prop="year" fixed="left" width="70px" sortable
+            <el-table-column label="届别" align="center" prop="year" fixed="left" width="50px" sortable
                 show-overflow-tooltip />
             <el-table-column label="年级" align="center" prop="grade" fixed="left" width="50px" sortable
                 show-overflow-tooltip>
@@ -165,18 +166,19 @@
                     <dict-tag :options="dict.type.grade_da" :value="scope.row.grade" />
                 </template>
             </el-table-column>
-            <el-table-column label="姓名" align="center" prop="name" sortable width="80px" show-overflow-tooltip />
+            <el-table-column label="姓名" align="center" prop="name" sortable width="65px" show-overflow-tooltip />
             <el-table-column label="学科" align="center" prop="sub" sortable show-overflow-tooltip width="50px">
                 <template slot-scope="scope">
                     <dict-tag :options="dict.type.teaching_subjects" :value="scope.row.sub" />
                 </template>
             </el-table-column>
-            <el-table-column label="聘任岗位" align="center" prop="appointmentPost" sortable width="80px" show-overflow-tooltip>
+            <el-table-column label="聘任岗位" align="center" prop="appointmentPost" sortable width="80px"
+                show-overflow-tooltip>
                 <template slot-scope="scope">
                     <dict-tag :options="dict.type.appointment_positions" :value="scope.row.appointmentPost" />
                 </template>
             </el-table-column>
-            <el-table-column label="聘任职务" align="center" prop="appointmentPosition" sortable width="120px"
+            <el-table-column label="聘任职务" align="center" prop="appointmentPosition" sortable width="80px"
                 show-overflow-tooltip />
             <el-table-column label="聘任情况" align="center" prop="appointmentSituation" sortable width="80px"
                 show-overflow-tooltip>
@@ -184,8 +186,8 @@
                     <dict-tag :options="dict.type.appointment_situation" :value="scope.row.appointmentSituation" />
                 </template>
             </el-table-column>
-            <el-table-column label="班级" align="center" prop="className" sortable width="80px" show-overflow-tooltip />
-            <el-table-column label=" 班级类型" align="center" width="140px" show-overflow-tooltip>
+            <el-table-column label="班级" align="center" prop="className" sortable width="50px" show-overflow-tooltip />
+            <el-table-column label=" 班级类型" align="center" width="105px" show-overflow-tooltip>
                 <template slot-scope="scope">
                     <span v-if="getSelectedTypes(scope.row.classType).length > 0">
                         <span v-for="(option, index) in getSelectedTypes(scope.row.classType)" :key="index">
@@ -199,12 +201,12 @@
             <el-table-column label="正课" align="center" prop="requiredCourses" sortable width="60px" show-overflow-tooltip />
             <el-table-column label="晚自习" align="center" prop="eveningSelfStudy" sortable width="70px"
                 show-overflow-tooltip /> -->
-            <el-table-column label="周课时量" align="center" prop="weeklyClassHours" sortable width="80px"
-                show-overflow-tooltip />
+            <el-table-column label="周课时量" align="center" prop="weeklyClassHours" sortable width="80px" />
             <!-- <el-table-column label="合计" align="center" prop="amountTo" sortable show-overflow-tooltip /> -->
-            <el-table-column label="证明人" align="center" prop="userName" width="80px" sortable show-overflow-tooltip />
+            <el-table-column label="证明人" align="center" prop="userName" width="70px" sortable show-overflow-tooltip />
             <el-table-column label="备注" align="center" prop="remark" sortable show-overflow-tooltip />
-            <el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="150px" fixed="right">
+            <el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="150px"
+                fixed="right">
                 <template slot-scope="scope">
                     <el-button size="mini" type="text" @click="handleUpdate(scope.row)"
                         v-hasPermi="['system:aworkload:edit']">修改</el-button>
@@ -215,8 +217,8 @@
                 </template>
             </el-table-column>
         </el-table>
-        <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize"
-            @pagination="getList" />
+        <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum"
+            :limit.sync="queryParams.pageSize" @pagination="getList" />
         <!-- 添加或修改工作量信息对话框 -->
         <el-dialog :title="title" :visible.sync="open" width="800px" append-to-body>
             <el-form ref="form" :model="form" :rules="rules" label-width="90px">
@@ -233,8 +235,8 @@
                     <el-col :span="12">
                         <el-form-item label="学期" prop="semester">
                             <el-select v-model="form.semester" placeholder="请选择" clearable style="width: 100%;">
-                                <el-option v-for="dict in dict.type.semester_jsdzda" :key="dict.value" :label="dict.label"
-                                    :value="dict.value">
+                                <el-option v-for="dict in dict.type.semester_jsdzda" :key="dict.value"
+                                    :label="dict.label" :value="dict.value">
                                 </el-option>
                             </el-select>
                         </el-form-item>
@@ -269,8 +271,8 @@
                     <el-col :span="12">
                         <el-form-item label="学科" prop="sub">
                             <el-select v-model="form.sub" placeholder="请选择" clearable style="width: 100%">
-                                <el-option v-for="dict in dict.type.teaching_subjects" :key="dict.value" :label="dict.label"
-                                    :value="dict.value">
+                                <el-option v-for="dict in dict.type.teaching_subjects" :key="dict.value"
+                                    :label="dict.label" :value="dict.value">
                                 </el-option>
                             </el-select>
                         </el-form-item>
@@ -300,7 +302,8 @@
                     </el-col>
                     <el-col :span="12">
                         <el-form-item label="聘任情况" prop="appointmentSituation">
-                            <el-select v-model="form.appointmentSituation" placeholder="请选择" clearable style="width: 100%">
+                            <el-select v-model="form.appointmentSituation" placeholder="请选择" clearable
+                                style="width: 100%">
                                 <el-option v-for="dict in dict.type.appointment_situation" :key="dict.value"
                                     :label="dict.label" :value="dict.value">
                                 </el-option>
@@ -316,7 +319,8 @@
                     </el-col>
                     <el-col :span="12">
                         <el-form-item label="班级类型" prop="classType">
-                            <el-select v-model="form.classType" multiple clearable placeholder="请选择" style="width: 100%;">
+                            <el-select v-model="form.classType" multiple clearable placeholder="请选择"
+                                style="width: 100%;">
                                 <el-option v-for="dict in dict.type.class_type" :key="dict.value" :label="dict.label"
                                     :value="dict.value">
                                 </el-option>
@@ -381,8 +385,8 @@
                     <el-col :span="12">
                         <el-form-item label="学期" prop="semester">
                             <el-select v-model="form.semester" clearable placeholder="请选择" style="width: 100%;">
-                                <el-option v-for="dict in dict.type.semester_jsdzda" :key="dict.value" :label="dict.label"
-                                    :value="dict.value">
+                                <el-option v-for="dict in dict.type.semester_jsdzda" :key="dict.value"
+                                    :label="dict.label" :value="dict.value">
                                 </el-option>
                             </el-select>
                         </el-form-item>
@@ -417,8 +421,8 @@
                     <el-col :span="12">
                         <el-form-item label="学科" prop="sub">
                             <el-select v-model="form.sub" placeholder="请选择" clearable style="width: 100%">
-                                <el-option v-for="dict in dict.type.teaching_subjects" :key="dict.value" :label="dict.label"
-                                    :value="dict.value">
+                                <el-option v-for="dict in dict.type.teaching_subjects" :key="dict.value"
+                                    :label="dict.label" :value="dict.value">
                                 </el-option>
                             </el-select>
                         </el-form-item>
@@ -448,7 +452,8 @@
                     </el-col>
                     <el-col :span="12">
                         <el-form-item label="聘任情况" prop="appointmentSituation">
-                            <el-select v-model="form.appointmentSituation" placeholder="请选择" clearable style="width: 100%">
+                            <el-select v-model="form.appointmentSituation" placeholder="请选择" clearable
+                                style="width: 100%">
                                 <el-option v-for="dict in dict.type.appointment_situation" :key="dict.value"
                                     :label="dict.label" :value="dict.value">
                                 </el-option>
@@ -464,7 +469,8 @@
                     </el-col>
                     <el-col :span="12">
                         <el-form-item label="班级类型" prop="classType">
-                            <el-select v-model="form.classType" multiple placeholder="请选择" clearable style="width: 100%">
+                            <el-select v-model="form.classType" multiple placeholder="请选择" clearable
+                                style="width: 100%">
                                 <el-option v-for="dict in dict.type.class_type" :key="dict.value" :label="dict.label"
                                     :value="dict.value">
                                 </el-option>
@@ -531,8 +537,8 @@
                     <el-col :span="12">
                         <el-form-item label="学期" prop="semester">
                             <el-select v-model="form.semester" placeholder="请选择" style="width: 100%;">
-                                <el-option v-for="dict in dict.type.semester_jsdzda" :key="dict.value" :label="dict.label"
-                                    :value="dict.value">
+                                <el-option v-for="dict in dict.type.semester_jsdzda" :key="dict.value"
+                                    :label="dict.label" :value="dict.value">
                                 </el-option>
                             </el-select>
                         </el-form-item>
@@ -567,8 +573,8 @@
                     <el-col :span="12">
                         <el-form-item label="学科" prop="sub">
                             <el-select v-model="form.sub" placeholder="请选择" style="width: 100%">
-                                <el-option v-for="dict in dict.type.teaching_subjects" :key="dict.value" :label="dict.label"
-                                    :value="dict.value">
+                                <el-option v-for="dict in dict.type.teaching_subjects" :key="dict.value"
+                                    :label="dict.label" :value="dict.value">
                                 </el-option>
                             </el-select>
                         </el-form-item>
@@ -673,7 +679,8 @@
                 <el-form-item prop="dataUrl">
                     <el-upload ref="upload" :limit="1" accept=".xlsx, .xls" :headers="upload.headers"
                         :action="upload.url + '?updateSupport=' + upload.updateSupport" :disabled="upload.isUploading"
-                        :on-progress="handleFileUploadProgress" :on-success="handleFileSuccess" :auto-upload="false" drag>
+                        :on-progress="handleFileUploadProgress" :on-success="handleFileSuccess" :auto-upload="false"
+                        drag>
                         <i class="el-icon-upload"></i>
                         <div class="el-upload__text">
                             将文件拖到此处，或<em>点击上传</em>
@@ -755,6 +762,8 @@ export default {
             queryParams: {
                 pageNum: 1,
                 pageSize: 10,
+                orderByColumn: "",
+                isAsc: "asc",
                 schoolYear: null,
                 semester: null,
                 year: null,
@@ -820,6 +829,23 @@ export default {
         this.getList();
     },
     methods: {
+        //排序列
+        sortChange(data) {
+            console.log(data, 'data');
+            const { prop, order } = data
+            //排序列
+            this.queryParams.orderByColumn = prop;
+            //排序顺序ascending或descending
+            // this.queryParams.isAsc = order;
+            if (order == "ascending") {
+                this.queryParams.isAsc = 'asc';
+            } else {
+                this.queryParams.isAsc = 'desc';
+            }
+            //返回第一页
+            this.queryParams.pageNum = 1;
+            this.getList();
+        },
         handleQuerycx() {
             this.query = true;
             this.resetcx();
@@ -1074,4 +1100,9 @@ export default {
     padding: 0;
 
 }
+
+::v-deep.el-table--border .el-table__cell .cell {
+    padding-left: 0px !important;
+
+}
 </style>
\ No newline at end of file

ruoyi-ui/src/views/smartSchool/officialWork/budgetFilling/index.vue

@@ -65,7 +65,6 @@
                     </div>
 
                 </div>
-
                 <!-- 表格数据 -->
                 <el-button class="el-icon-plus" size="mini" @click="addLine()">增加</el-button>
                 <el-table border :data="postForm.xzTable" ref="xzTable" class="xzTable" :header-cell-style="{

ruoyi-ui/src/views/smartSchool/personWork/awardTutoringstu/index.vue

@@ -6,8 +6,8 @@
                     <el-col :span="12">
                         <el-form-item label="学科" prop="sub">
                             <el-select v-model="queryParams.sub" clearable placeholder="请选择" style="width: 100%;">
-                                <el-option v-for="dict in dict.type.teaching_subjects" :key="dict.value" :label="dict.label"
-                                    :value="dict.value">
+                                <el-option v-for="dict in dict.type.teaching_subjects" :key="dict.value"
+                                    :label="dict.label" :value="dict.value">
                                 </el-option>
                             </el-select>
                         </el-form-item>
@@ -15,8 +15,8 @@
                     <el-col :span="12">
                         <el-form-item label="获奖类别" prop="awardtype">
                             <el-select v-model="queryParams.awardtype" clearable placeholder="请选择" style="width: 100%;">
-                                <el-option v-for="dict in dict.type.award_type_fdxs" :key="dict.value" :label="dict.label"
-                                    :value="dict.value">
+                                <el-option v-for="dict in dict.type.award_type_fdxs" :key="dict.value"
+                                    :label="dict.label" :value="dict.value">
                                 </el-option>
                             </el-select>
                         </el-form-item>
@@ -34,7 +34,8 @@
                     </el-col>
                     <el-col :span="12">
                         <el-form-item label="获奖等级" prop="awardlevel">
-                            <el-select v-model="queryParams.awardlevel" clearable placeholder="请选择" style="width: 100%;">
+                            <el-select v-model="queryParams.awardlevel" clearable placeholder="请选择"
+                                style="width: 100%;">
                                 <el-option v-for="dict in dict.type.award_rank" :key="dict.value" :label="dict.label"
                                     :value="dict.value">
                                 </el-option>
@@ -58,15 +59,15 @@
                 <el-row>
                     <el-col :span="12">
                         <el-form-item label="获奖开始时间" prop="startTime">
-                            <el-date-picker clearable v-model="queryParams.startTime" type="date" value-format="yyyy-MM-dd"
-                                placeholder="请选择" style="width: 100%;">
+                            <el-date-picker clearable v-model="queryParams.startTime" type="date"
+                                value-format="yyyy-MM-dd" placeholder="请选择" style="width: 100%;">
                             </el-date-picker>
                         </el-form-item>
                     </el-col>
                     <el-col :span="12">
                         <el-form-item label="获奖结束时间" prop="endTime">
-                            <el-date-picker clearable v-model="queryParams.endTime" type="date" value-format="yyyy-MM-dd"
-                                placeholder="请选择" style="width: 100%;">
+                            <el-date-picker clearable v-model="queryParams.endTime" type="date"
+                                value-format="yyyy-MM-dd" placeholder="请选择" style="width: 100%;">
                             </el-date-picker>
                         </el-form-item>
                     </el-col>
@@ -90,8 +91,8 @@
                     v-hasPermi="['system:tutoringstu:edit']">修改</el-button>
             </el-col>
             <el-col :span="1.5">
-                <el-button type="danger" plain icon="el-icon-delete" size="mini" :disabled="multiple" @click="handleDelete"
-                    v-hasPermi="['system:tutoringstu:remove']">删除</el-button>
+                <el-button type="danger" plain icon="el-icon-delete" size="mini" :disabled="multiple"
+                    @click="handleDelete" v-hasPermi="['system:tutoringstu:remove']">删除</el-button>
             </el-col>
             <el-col :span="1.5">
                 <el-button type="warning" plain icon="el-icon-download" size="mini" @click="handleExport"
@@ -100,7 +101,7 @@
             <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
         </el-row>
 
-        <el-table :row-style="{ height: '1px' }" :cell-style="{ padding: '0px' }"
+        <el-table border :row-style="{ height: '1px' }" :cell-style="{ padding: '0px' }"
             :header-cell-style="{ height: '50px', fontSize: '12px', padding: '0 0' }" :data="awardsList"
             @selection-change="handleSelectionChange" :default-sort="{ prop: 'awardtime', order: 'descending' }">
             <el-table-column type="selection" width="30" align="center" />
@@ -110,7 +111,8 @@
                     <span>辅导学生获奖</span>
                 </template>
             </el-table-column>
-            <el-table-column label="学科" align="center" prop="sub" sortable fixed="left" width="60px" show-overflow-tooltip>
+            <el-table-column label="学科" align="center" prop="sub" sortable fixed="left" width="60px"
+                show-overflow-tooltip>
                 <template slot-scope="scope">
                     <dict-tag :options="dict.type.teaching_subjects" :value="scope.row.sub" />
                 </template>
@@ -130,7 +132,8 @@
                     <dict-tag :options="dict.type.awards_level" :value="scope.row.awardrank" />
                 </template>
             </el-table-column>
-            <el-table-column label="比赛名称" align="center" prop="resultname" sortable width="120px" show-overflow-tooltip />
+            <el-table-column label="比赛名称" align="center" prop="resultname" sortable width="120px"
+                show-overflow-tooltip />
             <el-table-column label="获奖人" align="center" prop="username" sortable width="80px" show-overflow-tooltip />
             <el-table-column label="指导教师" align="center" prop="guidanceteacher" sortable width="80px"
                 show-overflow-tooltip />
@@ -162,8 +165,8 @@
                 </template>
             </el-table-column>
         </el-table>
-        <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize"
-            @pagination="getList" />
+        <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum"
+            :limit.sync="queryParams.pageSize" @pagination="getList" />
 
         <!-- 添加或修改教师获奖对话框 -->
         <el-dialog :title="title" :visible.sync="open" width="1000px" append-to-body>
@@ -172,8 +175,8 @@
                     <el-col :span="12">
                         <el-form-item label="学科" prop="sub">
                             <el-select v-model="form.sub" clearable placeholder="请选择" style="width: 100%;">
-                                <el-option v-for="dict in dict.type.teaching_subjects" :key="dict.value" :label="dict.label"
-                                    :value="dict.value">
+                                <el-option v-for="dict in dict.type.teaching_subjects" :key="dict.value"
+                                    :label="dict.label" :value="dict.value">
                                 </el-option>
                             </el-select>
                         </el-form-item>
@@ -181,8 +184,8 @@
                     <el-col :span="12">
                         <el-form-item label="获奖类别" prop="awardtype">
                             <el-select v-model="form.awardtype" placeholder="请选择" clearable style="width: 100%;">
-                                <el-option v-for="dict in dict.type.award_type_fdxs" :key="dict.value" :label="dict.label"
-                                    :value="dict.value">
+                                <el-option v-for="dict in dict.type.award_type_fdxs" :key="dict.value"
+                                    :label="dict.label" :value="dict.value">
                                 </el-option>
                             </el-select>
                         </el-form-item>
@@ -576,7 +579,7 @@ export default {
     }
 };
 </script>
-<style scoped lang="scss" >
+<style scoped lang="scss">
 .avatar-uploader .el-upload {
     border: 1px dashed #d9d9d9;
     border-radius: 6px;
@@ -637,4 +640,9 @@ export default {
     padding: 0;
 
 }
+
+::v-deep.el-table--border .el-table__cell .cell {
+    padding-left: 0px !important;
+
+}
 </style>

ruoyi-ui/src/views/smartSchool/personWork/comprehensiveHonors/index.vue

@@ -6,8 +6,8 @@
                     <el-col :span="12">
                         <el-form-item label="学科" prop="sub">
                             <el-select v-model="queryParams.sub" clearable placeholder="请选择" style="width: 100%;">
-                                <el-option v-for="dict in dict.type.teaching_subjects" :key="dict.value" :label="dict.label"
-                                    :value="dict.value">
+                                <el-option v-for="dict in dict.type.teaching_subjects" :key="dict.value"
+                                    :label="dict.label" :value="dict.value">
                                 </el-option>
                             </el-select>
                         </el-form-item>
@@ -31,7 +31,8 @@
                     </el-col>
                     <el-col :span="12">
                         <el-form-item label="获奖等级" prop="awardLevel">
-                            <el-select v-model="queryParams.awardLevel" clearable placeholder="请选择" style="width: 100%;">
+                            <el-select v-model="queryParams.awardLevel" clearable placeholder="请选择"
+                                style="width: 100%;">
                                 <el-option v-for="dict in dict.type.award_rank" :key="dict.value" :label="dict.label"
                                     :value="dict.value">
                                 </el-option>
@@ -48,8 +49,8 @@
                     </el-col>
                     <el-col :span="12">
                         <el-form-item label="获奖开始时间" prop="startTime">
-                            <el-date-picker clearable v-model="queryParams.startTime" type="date" value-format="yyyy-MM-dd"
-                                placeholder="请选择" style="width: 100%;">
+                            <el-date-picker clearable v-model="queryParams.startTime" type="date"
+                                value-format="yyyy-MM-dd" placeholder="请选择" style="width: 100%;">
                             </el-date-picker>
                         </el-form-item>
                     </el-col>
@@ -57,8 +58,8 @@
                 <el-row>
                     <el-col :span="12">
                         <el-form-item label="获奖结束时间" prop="endTime">
-                            <el-date-picker clearable v-model="queryParams.endTime" type="date" value-format="yyyy-MM-dd"
-                                placeholder="请选择" style="width: 100%;">
+                            <el-date-picker clearable v-model="queryParams.endTime" type="date"
+                                value-format="yyyy-MM-dd" placeholder="请选择" style="width: 100%;">
                             </el-date-picker>
                         </el-form-item>
                     </el-col>
@@ -78,8 +79,8 @@
                     v-hasPermi="['system:honors:add']">新增</el-button>
             </el-col>
             <el-col :span="1.5">
-                <el-button type="danger" plain icon="el-icon-delete" size="mini" :disabled="multiple" @click="handleDelete"
-                    v-hasPermi="['system:honors:remove']">删除</el-button>
+                <el-button type="danger" plain icon="el-icon-delete" size="mini" :disabled="multiple"
+                    @click="handleDelete" v-hasPermi="['system:honors:remove']">删除</el-button>
             </el-col>
             <el-col :span="1.5">
                 <el-button type="warning" plain icon="el-icon-download" size="mini" @click="handleExport"
@@ -88,7 +89,7 @@
             <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
         </el-row>
 
-        <el-table :row-style="{ height: '1px' }" :cell-style="{ padding: '0px' }"
+        <el-table border :row-style="{ height: '1px' }" :cell-style="{ padding: '0px' }"
             :header-cell-style="{ height: '50px', fontSize: '12px', padding: '0 0' }" :data="honorsList"
             @selection-change="handleSelectionChange" :default-sort="{ prop: 'awardTime', order: 'descending' }">
             <el-table-column type="selection" width="30" align="center" />
@@ -99,7 +100,8 @@
                     <span>综合荣誉</span>
                 </template>
             </el-table-column>
-            <el-table-column label="学科" align="center" prop="sub" sortable fixed="left" width="65px" show-overflow-tooltip>
+            <el-table-column label="学科" align="center" prop="sub" sortable fixed="left" width="65px"
+                show-overflow-tooltip>
                 <template slot-scope="scope">
                     <dict-tag :options="dict.type.teaching_subjects" :value="scope.row.sub" />
                 </template>
@@ -129,24 +131,27 @@
                     <dict-tag :options="dict.type.audit_states" :value="scope.row.auditState" />
                 </template>
             </el-table-column>
-            <el-table-column label="操作" align="center" class-name="small-padding fixed-width" fixed="right" width="150px">
+            <el-table-column label="操作" align="center" class-name="small-padding fixed-width" fixed="right"
+                width="150px">
                 <template slot-scope="scope">
-                    <el-button size="mini" type="text" @click="handleUpdate(scope.row)" v-hasPermi="['system:honors:edit']"
+                    <el-button size="mini" type="text" @click="handleUpdate(scope.row)"
+                        v-hasPermi="['system:honors:edit']"
                         v-if="scope.row.auditState === '0' || scope.row.auditState === '3'">修改</el-button>
-                    <el-button size="mini" type="text" @click="handleLook(scope.row)" v-hasPermi="['system:honors:look']"
+                    <el-button size="mini" type="text" @click="handleLook(scope.row)"
+                        v-hasPermi="['system:honors:look']"
                         v-if="scope.row.auditState === '0' || scope.row.auditState === '1' || scope.row.auditState === '3' || scope.row.auditState === '2'">查看</el-button>
                     <el-button size="mini" type="text" @click="handleDelete(scope.row)"
                         v-hasPermi="['system:honors:remove']"
                         v-if="scope.row.auditState === '0' || scope.row.auditState === '3'">删除</el-button>
-                    <el-button size="mini" type="text" @click="handleExamine(scope.row)" v-hasPermi="['system:honors:sub']"
-                        v-if="scope.row.auditState === '0'">提交</el-button>
+                    <el-button size="mini" type="text" @click="handleExamine(scope.row)"
+                        v-hasPermi="['system:honors:sub']" v-if="scope.row.auditState === '0'">提交</el-button>
 
                 </template>
             </el-table-column>
         </el-table>
 
-        <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize"
-            @pagination="getList" />
+        <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum"
+            :limit.sync="queryParams.pageSize" @pagination="getList" />
 
         <!-- 添加或修改综合荣誉对话框 -->
         <el-dialog :title="title" :visible.sync="open" width="1000px" append-to-body>
@@ -155,8 +160,8 @@
                     <el-col :span="12">
                         <el-form-item label="学科" prop="sub">
                             <el-select v-model="form.sub" clearable placeholder="请选择" style="width: 100%;">
-                                <el-option v-for="dict in dict.type.teaching_subjects" :key="dict.value" :label="dict.label"
-                                    :value="dict.value">
+                                <el-option v-for="dict in dict.type.teaching_subjects" :key="dict.value"
+                                    :label="dict.label" :value="dict.value">
                                 </el-option>
                             </el-select>
                         </el-form-item>
@@ -593,7 +598,7 @@ export default {
     }
 };
 </script>
-<style scoped lang="scss" >
+<style scoped lang="scss">
 .avatar-uploader .el-upload {
     border: 1px dashed #d9d9d9;
     border-radius: 6px;
@@ -655,4 +660,9 @@ export default {
     padding: 0;
 
 }
+
+::v-deep.el-table--border .el-table__cell .cell {
+    padding-left: 0px !important;
+
+}
 </style>

ruoyi-ui/src/views/smartSchool/personWork/essaysWritings/index.vue

-
 <template>
     <div class="app-container">
         <el-dialog title="查询" :visible.sync="query" width="50%" append-to-body>
@@ -7,8 +6,8 @@
                     <el-col :span="12">
                         <el-form-item label="学科" prop="sub">
                             <el-select v-model="queryParams.sub" clearable placeholder="请选择" style="width: 100%;">
-                                <el-option v-for="dict in dict.type.teaching_subjects" :key="dict.value" :label="dict.label"
-                                    :value="dict.value">
+                                <el-option v-for="dict in dict.type.teaching_subjects" :key="dict.value"
+                                    :label="dict.label" :value="dict.value">
                                 </el-option>
                             </el-select>
                         </el-form-item>
@@ -35,7 +34,8 @@
                     </el-col>
                     <el-col :span="12">
                         <el-form-item label="获奖等级" prop="awardLevel">
-                            <el-select v-model="queryParams.awardLevel" clearable placeholder="请选择" style="width: 100%;">
+                            <el-select v-model="queryParams.awardLevel" clearable placeholder="请选择"
+                                style="width: 100%;">
                                 <el-option v-for="dict in dict.type.award_rank" :key="dict.value" :label="dict.label"
                                     :value="dict.value">
                                 </el-option>
@@ -52,15 +52,15 @@
                     </el-col>
                     <el-col :span="12">
                         <el-form-item label="获奖开始时间" prop="awardTime">
-                            <el-date-picker clearable v-model="queryParams.startTime" type="date" value-format="yyyy-MM-dd"
-                                placeholder="请选择" style="width: 100%;">
+                            <el-date-picker clearable v-model="queryParams.startTime" type="date"
+                                value-format="yyyy-MM-dd" placeholder="请选择" style="width: 100%;">
                             </el-date-picker>
                         </el-form-item>
                     </el-col>
                     <el-col :span="12">
                         <el-form-item label="获奖结束时间" prop="awardTime">
-                            <el-date-picker clearable v-model="queryParams.endTime" type="date" value-format="yyyy-MM-dd"
-                                placeholder="请选择" style="width: 100%;">
+                            <el-date-picker clearable v-model="queryParams.endTime" type="date"
+                                value-format="yyyy-MM-dd" placeholder="请选择" style="width: 100%;">
                             </el-date-picker>
                         </el-form-item>
                     </el-col>
@@ -84,8 +84,8 @@
                     v-hasPermi="['system:works:edit']">修改</el-button>
             </el-col>
             <el-col :span="1.5">
-                <el-button type="danger" plain icon="el-icon-delete" size="mini" :disabled="multiple" @click="handleDelete"
-                    v-hasPermi="['system:works:remove']">删除</el-button>
+                <el-button type="danger" plain icon="el-icon-delete" size="mini" :disabled="multiple"
+                    @click="handleDelete" v-hasPermi="['system:works:remove']">删除</el-button>
             </el-col>
             <el-col :span="1.5">
                 <el-button type="warning" plain icon="el-icon-download" size="mini" @click="handleExport"
@@ -94,7 +94,7 @@
             <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
         </el-row>
 
-        <el-table :row-style="{ height: '1px' }" :cell-style="{ padding: '0px' }"
+        <el-table border :row-style="{ height: '1px' }" :cell-style="{ padding: '0px' }" @sort-change="sortChange"
             :header-cell-style="{ height: '50px', fontSize: '12px', padding: '0 0' }" :data="worksList"
             @selection-change="handleSelectionChange" :default-sort="{ prop: 'awardTime', order: 'descending' }">
             <el-table-column type="selection" width="30" align="center" />
@@ -104,7 +104,8 @@
                     <span>论文论著</span>
                 </template>
             </el-table-column>
-            <el-table-column label="学科" align="center" prop="sub" sortable fixed="left" width="60px" show-overflow-tooltip>
+            <el-table-column label="学科" align="center" prop="sub" sortable fixed="left" width="60px"
+                show-overflow-tooltip>
                 <template slot-scope="scope">
                     <dict-tag :options="dict.type.teaching_subjects" :value="scope.row.sub" />
                 </template>
@@ -139,23 +140,26 @@
                 </template>
             </el-table-column>
 
-            <el-table-column label="操作" align="center" class-name="small-padding fixed-width" fixed="right" width="160px">
+            <el-table-column label="操作" align="center" class-name="small-padding fixed-width" fixed="right"
+                width="160px">
                 <template slot-scope="scope">
-                    <el-button size="mini" type="text" @click="handleUpdate(scope.row)" v-hasPermi="['system:works:edit']"
+                    <el-button size="mini" type="text" @click="handleUpdate(scope.row)"
+                        v-hasPermi="['system:works:edit']"
                         v-if="scope.row.auditState === '0' || scope.row.auditState === '3'">修改</el-button>
                     <el-button size="mini" type="text" @click="handleLook(scope.row)" v-hasPermi="['system:works:look']"
                         v-if="scope.row.auditState === '0' || scope.row.auditState === '1' || scope.row.auditState === '3' || scope.row.auditState === '2'">查看</el-button>
-                    <el-button size="mini" type="text" @click="handleDelete(scope.row)" v-hasPermi="['system:works:remove']"
+                    <el-button size="mini" type="text" @click="handleDelete(scope.row)"
+                        v-hasPermi="['system:works:remove']"
                         v-if="scope.row.auditState === '0' || scope.row.auditState === '3'">删除</el-button>
-                    <el-button size="mini" type="text" @click="handleExamine(scope.row)" v-hasPermi="['system:works:sub']"
-                        v-if="scope.row.auditState === '0'">提交</el-button>
+                    <el-button size="mini" type="text" @click="handleExamine(scope.row)"
+                        v-hasPermi="['system:works:sub']" v-if="scope.row.auditState === '0'">提交</el-button>
 
                 </template>
             </el-table-column>
         </el-table>
 
-        <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize"
-            @pagination="getList" />
+        <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum"
+            :limit.sync="queryParams.pageSize" @pagination="getList" />
 
         <!-- 添加或修改论文著作对话框 -->
         <el-dialog :title="title" :visible.sync="open" width="1000px" append-to-body>
@@ -164,8 +168,8 @@
                     <el-col :span="12">
                         <el-form-item label="学科" prop="sub">
                             <el-select v-model="form.sub" placeholder="请选择" clearable style="width: 100%;">
-                                <el-option v-for="dict in dict.type.teaching_subjects" :key="dict.value" :label="dict.label"
-                                    :value="dict.value">
+                                <el-option v-for="dict in dict.type.teaching_subjects" :key="dict.value"
+                                    :label="dict.label" :value="dict.value">
                                 </el-option>
                             </el-select>
                         </el-form-item>
@@ -173,8 +177,8 @@
                     <el-col :span="12">
                         <el-form-item label="获奖类别" prop="awardType">
                             <el-select v-model="form.awardType" clearable placeholder="请选择" style="width: 100%;">
-                                <el-option v-for="dict in dict.type.award_categories" :key="dict.value" :label="dict.label"
-                                    :value="dict.value">
+                                <el-option v-for="dict in dict.type.award_categories" :key="dict.value"
+                                    :label="dict.label" :value="dict.value">
                                 </el-option>
                             </el-select>
                         </el-form-item>
@@ -307,6 +311,8 @@ export default {
             queryParams: {
                 pageNum: 1,
                 pageSize: 10,
+                orderByColumn: "",
+                isAsc: "asc",
                 sub: null,
                 awardType: null,
                 awardRank: null,
@@ -371,6 +377,23 @@ export default {
         this.getList();
     },
     methods: {
+        //排序列
+        sortChange(data) {
+            console.log(data, 'data');
+            const { prop, order } = data
+            //排序列
+            this.queryParams.orderByColumn = prop;
+            //排序顺序ascending或descending
+            // this.queryParams.isAsc = order;
+            if (order == "ascending") {
+                this.queryParams.isAsc = 'asc';
+            } else {
+                this.queryParams.isAsc = 'desc';
+            }
+            //返回第一页
+            this.queryParams.pageNum = 1;
+            this.getList();
+        },
         /** 查询论文著作列表 */
         getList() {
             this.loading = true;
@@ -594,7 +617,7 @@ export default {
     }
 };
 </script>
-<style scoped lang="scss" >
+<style scoped lang="scss">
 .avatar-uploader .el-upload {
     border: 1px dashed #d9d9d9;
     border-radius: 6px;
@@ -655,4 +678,9 @@ export default {
     padding: 0;
 
 }
+
+::v-deep.el-table--border .el-table__cell .cell {
+    padding-left: 0px !important;
+
+}
 </style>

ruoyi-ui/src/views/smartSchool/personWork/examinationScore/index.vue

@@ -15,8 +15,8 @@
                     <el-col :span="12">
                         <el-form-item label="学科" prop="sub">
                             <el-select v-model="queryParams.sub" clearable placeholder="请选择" style="width: 100%;">
-                                <el-option v-for="dict in dict.type.teaching_subjects" :key="dict.value" :label="dict.label"
-                                    :value="dict.value">
+                                <el-option v-for="dict in dict.type.teaching_subjects" :key="dict.value"
+                                    :label="dict.label" :value="dict.value">
                                 </el-option>
                             </el-select>
                         </el-form-item>
@@ -52,7 +52,8 @@
                     </el-col>
                     <el-col :span="12">
                         <el-form-item label="高考评优" prop="gkAppraising">
-                            <el-select v-model="queryParams.gkAppraising" clearable placeholder="请选择" style="width: 100%">
+                            <el-select v-model="queryParams.gkAppraising" clearable placeholder="请选择"
+                                style="width: 100%">
                                 <el-option v-for="dict in dict.type.gk_appraising" :key="dict.value" :label="dict.label"
                                     :value="dict.value">
                                 </el-option>
@@ -67,7 +68,6 @@
                 </el-form-item>
             </el-form>
         </el-dialog>
-
         <el-row :gutter="10" class="mb8">
             <el-col :span="1.5">
                 <el-button type="primary" plain icon="el-icon-search" size="mini" @click="handleQuerycx">查询</el-button>
@@ -81,8 +81,8 @@
                     v-hasPermi="['system:achievement:edit']">修改</el-button>
             </el-col>
             <el-col :span="1.5">
-                <el-button type="danger" plain icon="el-icon-delete" size="mini" :disabled="multiple" @click="handleDelete"
-                    v-hasPermi="['system:achievement:remove']">删除</el-button>
+                <el-button type="danger" plain icon="el-icon-delete" size="mini" :disabled="multiple"
+                    @click="handleDelete" v-hasPermi="['system:achievement:remove']">删除</el-button>
             </el-col>
             <el-col :span="1.5">
                 <el-button type="warning" plain icon="el-icon-download" size="mini" @click="handleExport"
@@ -90,8 +90,7 @@
             </el-col>
             <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
         </el-row>
-
-        <el-table :row-style="{ height: '1px' }" :cell-style="{ padding: '0px' }"
+        <el-table border :row-style="{ height: '1px' }" :cell-style="{ padding: '0px' }"
             :header-cell-style="{ height: '50px', fontSize: '12px', padding: '0 0' }" :data="achievementList"
             @selection-change="handleSelectionChange" :default-sort="{ prop: 'year', order: 'descending' }">
             <el-table-column type="selection" width="30" align="center" sortable />
@@ -150,8 +149,8 @@
             </el-table-column>
         </el-table>
 
-        <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize"
-            @pagination="getList" />
+        <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum"
+            :limit.sync="queryParams.pageSize" @pagination="getList" />
 
         <!-- 添加或修改高考成绩对话框 -->
         <el-dialog :title="title" :visible.sync="open" width="800px" append-to-body>
@@ -160,8 +159,8 @@
                     <el-col :span="12">
                         <el-form-item label="学科" prop="sub">
                             <el-select v-model="form.sub" clearable placeholder="请选择" style="width: 100%;">
-                                <el-option v-for="dict in dict.type.teaching_subjects" :key="dict.value" :label="dict.label"
-                                    :value="dict.value">
+                                <el-option v-for="dict in dict.type.teaching_subjects" :key="dict.value"
+                                    :label="dict.label" :value="dict.value">
                                 </el-option>
                             </el-select>
                         </el-form-item>
@@ -491,7 +490,7 @@ export default {
     }
 };
 </script>
-<style scoped lang="scss" >
+<style scoped lang="scss">
 ::v-deep .el-form-item {
     margin-bottom: 0px;
 }
@@ -529,4 +528,14 @@ export default {
     padding: 0;
 
 }
+
+::v-deep.el-table--border .el-table__cell .cell {
+    padding-left: 0px !important;
+
+}
+
+::v-deep.el-table--border .el-table__cell .cell {
+    padding-left: 0px !important;
+
+}
 </style>

ruoyi-ui/src/views/smartSchool/personWork/lectureAwards/index.vue

@@ -6,8 +6,8 @@
                     <el-col :span="12">
                         <el-form-item label="学科" prop="sub">
                             <el-select v-model="queryParams.sub" clearable placeholder="请选择" style="width: 100%;">
-                                <el-option v-for="dict in dict.type.teaching_subjects" :key="dict.value" :label="dict.label"
-                                    :value="dict.value">
+                                <el-option v-for="dict in dict.type.teaching_subjects" :key="dict.value"
+                                    :label="dict.label" :value="dict.value">
                                 </el-option>
                             </el-select>
                         </el-form-item>
@@ -34,7 +34,8 @@
                     </el-col>
                     <el-col :span="12">
                         <el-form-item label="获奖等级" prop="awardLevel">
-                            <el-select v-model="queryParams.awardLevel" clearable placeholder="请选择" style="width: 100%;">
+                            <el-select v-model="queryParams.awardLevel" clearable placeholder="请选择"
+                                style="width: 100%;">
                                 <el-option v-for="dict in dict.type.award_rank" :key="dict.value" :label="dict.label"
                                     :value="dict.value">
                                 </el-option>
@@ -51,15 +52,15 @@
                     </el-col>
                     <el-col :span="12">
                         <el-form-item label="获奖开始时间" prop="awardTime">
-                            <el-date-picker clearable v-model="queryParams.startTime" type="date" value-format="yyyy-MM-dd"
-                                placeholder="请选择" style="width: 100%;">
+                            <el-date-picker clearable v-model="queryParams.startTime" type="date"
+                                value-format="yyyy-MM-dd" placeholder="请选择" style="width: 100%;">
                             </el-date-picker>
                         </el-form-item>
                     </el-col>
                     <el-col :span="12">
                         <el-form-item label="获奖结束时间" prop="awardTime">
-                            <el-date-picker clearable v-model="queryParams.endTime" type="date" value-format="yyyy-MM-dd"
-                                placeholder="请选择" style="width: 100%;">
+                            <el-date-picker clearable v-model="queryParams.endTime" type="date"
+                                value-format="yyyy-MM-dd" placeholder="请选择" style="width: 100%;">
                             </el-date-picker>
                         </el-form-item>
                     </el-col>
@@ -84,8 +85,8 @@
                     v-hasPermi="['system:awards:edit']">修改</el-button>
             </el-col>
             <el-col :span="1.5">
-                <el-button type="danger" plain icon="el-icon-delete" size="mini" :disabled="multiple" @click="handleDelete"
-                    v-hasPermi="['system:awards:remove']">删除</el-button>
+                <el-button type="danger" plain icon="el-icon-delete" size="mini" :disabled="multiple"
+                    @click="handleDelete" v-hasPermi="['system:awards:remove']">删除</el-button>
             </el-col>
             <el-col :span="1.5">
                 <el-button type="warning" plain icon="el-icon-download" size="mini" @click="handleExport"
@@ -94,9 +95,9 @@
             <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
         </el-row>
 
-        <el-table :row-style="{ height: '1px' }" :cell-style="{ padding: '0px' }"
+        <el-table border :row-style="{ height: '1px' }" :cell-style="{ padding: '0px' }" @sort-change="sortChange"
             :header-cell-style="{ height: '50px', fontSize: '12px', padding: '0 0' }" :data="awardsList"
-            @selection-change="handleSelectionChange" :default-sort="{ prop: 'awardTime', order: 'descending' }">
+            @selection-change="handleSelectionChange" :default-sort="{ prop: 'awardTime', order: 'desc' }">
             <el-table-column type="selection" width="30" align="center" />
             <el-table-column type="index" label="序号" width="30" align="center" sortable fixed="left" />
             <el-table-column label="成长类型" align="center" fixed="left" width="80px" show-overflow-tooltip>
@@ -104,7 +105,8 @@
                     <span>讲课获奖</span>
                 </template>
             </el-table-column>
-            <el-table-column label="学科" align="center" prop="sub" sortable fixed="left" show-overflow-tooltip width="65px">
+            <el-table-column label="学科" align="center" prop="sub" sortable fixed="left" show-overflow-tooltip
+                width="65px">
                 <template slot-scope="scope">
                     <dict-tag :options="dict.type.teaching_subjects" :value="scope.row.sub" />
                 </template>
@@ -139,24 +141,27 @@
                 </template>
             </el-table-column>
 
-            <el-table-column label="操作" align="center" class-name="small-padding fixed-width" fixed="right" width="180px">
+            <el-table-column label="操作" align="center" class-name="small-padding fixed-width" fixed="right"
+                width="180px">
                 <template slot-scope="scope">
-                    <el-button size="mini" type="text" @click="handleUpdate(scope.row)" v-hasPermi="['system:awards:edit']"
+                    <el-button size="mini" type="text" @click="handleUpdate(scope.row)"
+                        v-hasPermi="['system:awards:edit']"
                         v-if="scope.row.auditState === '0' || scope.row.auditState === '3'">修改</el-button>
-                    <el-button size="mini" type="text" @click="handleLook(scope.row)" v-hasPermi="['system:awards:look']"
+                    <el-button size="mini" type="text" @click="handleLook(scope.row)"
+                        v-hasPermi="['system:awards:look']"
                         v-if="scope.row.auditState === '0' || scope.row.auditState === '1' || scope.row.auditState === '3' || scope.row.auditState === '2'">查看</el-button>
                     <el-button size="mini" type="text" @click="handleDelete(scope.row)"
                         v-hasPermi="['system:awards:remove']"
                         v-if="scope.row.auditState === '0' || scope.row.auditState === '3'">删除</el-button>
-                    <el-button size="mini" type="text" @click="handleExamine(scope.row)" v-hasPermi="['system:awards:sub']"
-                        v-if="scope.row.auditState === '0'">提交</el-button>
+                    <el-button size="mini" type="text" @click="handleExamine(scope.row)"
+                        v-hasPermi="['system:awards:sub']" v-if="scope.row.auditState === '0'">提交</el-button>
 
                 </template>
             </el-table-column>
         </el-table>
 
-        <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize"
-            @pagination="getList" />
+        <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum"
+            :limit.sync="queryParams.pageSize" @pagination="getList" />
 
         <!-- 添加或修改讲课获奖对话框 -->
         <el-dialog :title="title" :visible.sync="open" width="1000px" append-to-body>
@@ -165,8 +170,8 @@
                     <el-col :span="12">
                         <el-form-item label="学科" prop="sub">
                             <el-select v-model="form.sub" clearable placeholder="请选择" style="width: 100%;">
-                                <el-option v-for="dict in dict.type.teaching_subjects" :key="dict.value" :label="dict.label"
-                                    :value="dict.value">
+                                <el-option v-for="dict in dict.type.teaching_subjects" :key="dict.value"
+                                    :label="dict.label" :value="dict.value">
                                 </el-option>
                             </el-select>
                         </el-form-item>
@@ -311,6 +316,8 @@ export default {
             queryParams: {
                 pageNum: 1,
                 pageSize: 10,
+                orderByColumn: "",
+                isAsc: "asc",
                 sub: null,
                 awardType: null,
                 awardRank: null,
@@ -371,6 +378,23 @@ export default {
         this.getList();
     },
     methods: {
+        //排序列
+        sortChange(data) {
+            console.log(data, 'data');
+            const { prop, order } = data
+            //排序列
+            this.queryParams.orderByColumn = prop;
+            //排序顺序ascending或descending
+            // this.queryParams.isAsc = order;
+            if (order == "ascending") {
+                this.queryParams.isAsc = 'asc';
+            } else {
+                this.queryParams.isAsc = 'desc';
+            }
+            //返回第一页
+            this.queryParams.pageNum = 1;
+            this.getList();
+        },
 
         /** 查询讲课获奖列表 */
         getList() {
@@ -595,7 +619,7 @@ export default {
     }
 };
 </script>
-<style scoped lang="scss" >
+<style scoped lang="scss">
 .avatar-uploader .el-upload {
     border: 1px dashed #d9d9d9;
     border-radius: 6px;
@@ -656,4 +680,9 @@ export default {
     padding: 0;
 
 }
+
+::v-deep.el-table--border .el-table__cell .cell {
+    padding-left: 0px !important;
+
+}
 </style>

ruoyi-ui/src/views/smartSchool/personWork/personalInformation/index.vue

@@ -141,7 +141,7 @@
                                     </el-col>
                                     <el-col :span="4" class="border_right border-bottom table_cell background">
                                         <el-form-item prop="currentProfessionalTitle">
-                                            <span>现职称</span>
+                                            <span> 现具备专技资格</span>
                                         </el-form-item>
                                     </el-col>
                                     <el-col :span="4" class="border_right border-bottom table_cell">
@@ -156,7 +156,7 @@
                                 <el-col :span="24">
                                     <el-col :span="4" class="border_right border-bottom table_cell background">
                                         <el-form-item prop="currentProfessionalTitleTime">
-                                            <span>现职称取得资格时间</span>
+                                            <span>现具备专技资格时间</span>
                                         </el-form-item></el-col>
                                     <el-col :span="4" class="border_right border-bottom table_cell">
                                         <el-form-item prop="currentProfessionalTitleTime">
@@ -165,7 +165,7 @@
                                     </el-col>
                                     <el-col :span="4" class="border_right border-bottom table_cell background">
                                         <el-form-item prop="currentHiringProfessionalTitle">
-                                            <span>现聘职称</span>
+                                            <span>现聘专技资格</span>
                                         </el-form-item>
                                     </el-col>
                                     <el-col :span="4" class="border_right border-bottom table_cell">
@@ -175,7 +175,7 @@
                                     </el-col>
                                     <el-col :span="4" class="border_right border-bottom table_cell background">
                                         <el-form-item prop="currentHiringProfessionalTitleTime">
-                                            <span>现聘任职时间</span>
+                                            <span>现聘专技资格时间</span>
                                         </el-form-item>
                                     </el-col>
                                     <el-col :span="4" class="border_right border-bottom table_cell">
@@ -512,7 +512,7 @@
         <div style="border: 1px solid #f3f3f3;border-radius: 13px 13px 0 0 ; margin:  20px 0;">
             <div class="card_title">工作量信息</div>
             <div style="margin: 3px 10px 15px;">
-                <el-table :data="schoolAworkload" :row-style="{ height: '0' }" :cell-style="{ padding: '3px' }">
+                <el-table border :data="schoolAworkload" :row-style="{ height: '0' }" :cell-style="{ padding: '3px' }">
                     <el-table-column label="学年" align="center" prop="schoolYear" width="120px" fixed="left"
                         show-overflow-tooltip />
                     <el-table-column label="学期" align="center" prop="semester" fixed="left" show-overflow-tooltip>
@@ -532,7 +532,8 @@
                             <dict-tag :options="dict.type.teaching_subjects" :value="scope.row.sub" />
                         </template>
                     </el-table-column>
-                    <el-table-column label="聘任岗位" align="center" prop="appointmentPost" width="120px" show-overflow-tooltip>
+                    <el-table-column label="聘任岗位" align="center" prop="appointmentPost" width="120px"
+                        show-overflow-tooltip>
                         <template slot-scope="scope">
                             <dict-tag :options="dict.type.appointment_positions" :value="scope.row.appointmentPost" />
                         </template>
@@ -542,7 +543,8 @@
                     <el-table-column label="聘任情况" align="center" prop="appointmentSituation" width="120px"
                         show-overflow-tooltip>
                         <template slot-scope="scope">
-                            <dict-tag :options="dict.type.appointment_situation" :value="scope.row.appointmentSituation" />
+                            <dict-tag :options="dict.type.appointment_situation"
+                                :value="scope.row.appointmentSituation" />
                         </template>
                     </el-table-column>
                     <el-table-column label="班级" align="center" prop="className" show-overflow-tooltip />
@@ -565,7 +567,7 @@
         <div style="border: 1px solid #f3f3f3;border-radius: 13px 13px 0 0 ; margin:  20px 0;">
             <div class="card_title">班主任考核</div>
             <div style="margin: 3px 10px 15px;">
-                <el-table :data="schoolAclassTeacherAssessments" :row-style="{ height: '0' }"
+                <el-table border :data="schoolAclassTeacherAssessments" :row-style="{ height: '0' }"
                     :cell-style="{ padding: '3px' }">
                     <el-table-column label="学年" align="center" prop="schoolYear" show-overflow-tooltip />
                     <el-table-column label="学期" align="center" prop="semester" show-overflow-tooltip>
@@ -605,7 +607,7 @@
         <div style="border: 1px solid #f3f3f3;border-radius: 13px 13px 0 0 ; margin:  20px 0;">
             <div class="card_title">专业成长</div>
             <div style="margin: 3px 10px 15px;">
-                <el-table :data="specialityVos" :row-style="{ height: '0' }" :cell-style="{ padding: '3px' }">
+                <el-table border :data="specialityVos" :row-style="{ height: '0' }" :cell-style="{ padding: '3px' }">
                     <el-table-column label="成长类型" align="center" prop="growthType" show-overflow-tooltip>
                     </el-table-column>
                     <el-table-column label="学科" align="center" prop="sub" show-overflow-tooltip>
@@ -616,7 +618,8 @@
                     <el-table-column label="获奖类别" align="center" prop="awardtype" show-overflow-tooltip>
                         <template slot-scope="scope">
                             <span v-if="scope.row.growthType == '综合荣誉'">{{ scope.row.awardtype }}</span>
-                            <dict-tag v-else :options="getDictionaryByGrowthType(scope.row)" :value="scope.row.awardtype" />
+                            <dict-tag v-else :options="getDictionaryByGrowthType(scope.row)"
+                                :value="scope.row.awardtype" />
                         </template>
                     </el-table-column>
                     <el-table-column label="获奖等级" align="center" prop="awardlevel" show-overflow-tooltip>
@@ -641,7 +644,8 @@
         <div style="border: 1px solid #f3f3f3;border-radius: 13px 13px 0 0 ; margin:  20px 0;">
             <div class="card_title">高考成绩 </div>
             <div style="margin: 3px 10px 15px;">
-                <el-table :data="schoolGkAchievement" :row-style="{ height: '0' }" :cell-style="{ padding: '3px' }">
+                <el-table border :data="schoolGkAchievement" :row-style="{ height: '0' }"
+                    :cell-style="{ padding: '3px' }">
                     <el-table-column label="届别" align="center" prop="year" show-overflow-tooltip />
                     <el-table-column label="学科" align="center" prop="sub" show-overflow-tooltip>
                         <template slot-scope="scope">
@@ -668,7 +672,8 @@
         <div style="border: 1px solid #f3f3f3;border-radius: 13px 13px 0 0 ; margin:  20px 0;">
             <div class="card_title">教学成绩</div>
             <div style="margin: 3px 10px 15px;">
-                <el-table :data="schoolXteachingAchievements" :row-style="{ height: '0' }" :cell-style="{ padding: '3px' }">
+                <el-table border :data="schoolXteachingAchievements" :row-style="{ height: '0' }"
+                    :cell-style="{ padding: '3px' }">
                     <el-table-column label="学年" align="center" prop="schoolYear" show-overflow-tooltip />
                     <el-table-column label="学期" align="center" prop="semester" show-overflow-tooltip>
                         <template slot-scope="scope">
@@ -701,6 +706,8 @@
                     </el-table-column>
                     <el-table-column label="班级类型" align="center" prop="classType" show-overflow-tooltip>
                     </el-table-column>
+                    <el-table-column label="常规增量" align="center" prop="cgzl" show-overflow-tooltip />
+                    <el-table-column label="优生增量" align="center" prop="yszl" show-overflow-tooltip />
                     <el-table-column label="增量分" align="center" prop="assessmentScore" show-overflow-tooltip />
                 </el-table>
             </div>
@@ -709,7 +716,7 @@
         <div style="border: 1px solid #f3f3f3;border-radius: 13px 13px 0 0 ; margin:  20px 0;">
             <div class="card_title">辅导老师获奖</div>
             <div style="margin: 3px 10px 15px;">
-                <el-table :data="fudaoTeacher" :row-style="{ height: '0' }" :cell-style="{ padding: '3px' }">
+                <el-table border :data="fudaoTeacher" :row-style="{ height: '0' }" :cell-style="{ padding: '3px' }">
                     <el-table-column label="成长类型" align="center" show-overflow-tooltip width="120px">
                         <template>
                             <span>辅导老师获奖</span>
@@ -756,7 +763,7 @@
         <div style="border: 1px solid #f3f3f3;border-radius: 13px 13px 0 0 ; margin:  20px 0;">
             <div class="card_title">辅导学生获奖</div>
             <div style="margin: 3px 10px 15px;">
-                <el-table :data="fudaoStudent" :row-style="{ height: '0' }" :cell-style="{ padding: '3px' }">
+                <el-table border :data="fudaoStudent" :row-style="{ height: '0' }" :cell-style="{ padding: '3px' }">
                     <el-table-column label="成长类型" align="center" show-overflow-tooltip>
                         <template>
                             <span>辅导学生获奖</span>
@@ -798,7 +805,8 @@
         <div style="border: 1px solid #f3f3f3;border-radius: 13px 13px 0 0 ; margin:  20px 0;">
             <div class="card_title">年度考核</div>
             <div style="margin: 3px 10px 15px;">
-                <el-table :data="schoolAnnualAssessment" :row-style="{ height: '0' }" :cell-style="{ padding: '3px' }">
+                <el-table border :data="schoolAnnualAssessment" :row-style="{ height: '0' }"
+                    :cell-style="{ padding: '3px' }">
                     <el-table-column label="姓名" align="center" prop="name" show-overflow-tooltip />
                     <el-table-column label="年度" align="center" prop="year" show-overflow-tooltip />
                     <el-table-column label="考核结果" align="center" prop="checkResult" show-overflow-tooltip>
@@ -814,7 +822,7 @@
         <div style="border: 1px solid #f3f3f3;border-radius: 13px 13px 0 0 ; margin:  20px 0;">
             <div class="card_title">青年教师成长档案</div>
             <div style="margin: 3px 10px 15px;">
-                <el-table :data="youthTeacherList">
+                <el-table border :data="youthTeacherList">
                     <el-table-column label="学年" align="center" prop="schoolYear" />
                     <el-table-column label="学期" align="center" prop="semester">
                         <template slot-scope="scope">
@@ -937,11 +945,11 @@ export default {
                         this.form.teachingSubject = item.label
                     }
                 })
-                this.dict.type.current_professional.find(item => {
-                    if (item.value == response.data.basicInformation.currentHiringProfessionalTitle) {
-                        this.form.currentHiringProfessionalTitle = item.label
-                    }
-                })
+                // this.dict.type.current_professional.find(item => {
+                //     if (item.value == response.data.basicInformation.currentHiringProfessionalTitle) {
+                //         this.form.currentHiringProfessionalTitle = item.label
+                //     }
+                // })
                 this.dict.type.current_joblevel.find(item => {
                     if (item.value == response.data.basicInformation.currentJobLevel) {
                         this.form.currentJobLevel = item.label
@@ -953,11 +961,11 @@ export default {
                     }
                 })
 
-                this.dict.type.current_professional.find(item => {
-                    if (item.value == response.data.basicInformation.currentProfessionalTitle) {
-                        this.form.currentProfessionalTitle = item.label
-                    }
-                })
+                // this.dict.type.current_professional.find(item => {
+                //     if (item.value == response.data.basicInformation.currentProfessionalTitle) {
+                //         this.form.currentProfessionalTitle = item.label
+                //     }
+                // })
                 this.dict.type.duty_situation.find(item => {
                     if (item.value == response.data.basicInformation.onDutySituation) {
                         this.form.onDutySituation = item.label
@@ -1131,4 +1139,9 @@ export default {
     justify-content: flex-end;
     margin-top: 10px;
 }
+
+::v-deep.el-table--border .el-table__cell .cell {
+    padding-left: 0px !important;
+
+}
 </style>
\ No newline at end of file

ruoyi-ui/src/views/smartSchool/personWork/projectResearch/index.vue

-
 <template>
     <div class="app-container">
         <el-dialog title="查询" :visible.sync="query" width="50%" append-to-body>
@@ -7,8 +6,8 @@
                     <el-col :span="12">
                         <el-form-item label="学科" prop="sub">
                             <el-select v-model="queryParams.sub" clearable placeholder="请选择" style="width: 100%;">
-                                <el-option v-for="dict in dict.type.teaching_subjects" :key="dict.value" :label="dict.label"
-                                    :value="dict.value">
+                                <el-option v-for="dict in dict.type.teaching_subjects" :key="dict.value"
+                                    :label="dict.label" :value="dict.value">
                                 </el-option>
                             </el-select>
                         </el-form-item>
@@ -35,7 +34,8 @@
                     </el-col>
                     <el-col :span="12">
                         <el-form-item label="获奖等级" prop="awardLevel">
-                            <el-select v-model="queryParams.awardLevel" clearable placeholder="请选择" style="width: 100%;">
+                            <el-select v-model="queryParams.awardLevel" clearable placeholder="请选择"
+                                style="width: 100%;">
                                 <el-option v-for="dict in dict.type.award_rank" :key="dict.value" :label="dict.label"
                                     :value="dict.value">
                                 </el-option>
@@ -52,15 +52,15 @@
                     </el-col>
                     <el-col :span="12">
                         <el-form-item label="获奖开始时间" prop="awardTime">
-                            <el-date-picker clearable v-model="queryParams.startTime" type="date" value-format="yyyy-MM-dd"
-                                placeholder="请选择" style="width: 100%;">
+                            <el-date-picker clearable v-model="queryParams.startTime" type="date"
+                                value-format="yyyy-MM-dd" placeholder="请选择" style="width: 100%;">
                             </el-date-picker>
                         </el-form-item>
                     </el-col>
                     <el-col :span="12">
                         <el-form-item label="获奖结束时间" prop="awardTime">
-                            <el-date-picker clearable v-model="queryParams.endTime" type="date" value-format="yyyy-MM-dd"
-                                placeholder="请选择" style="width: 100%;">
+                            <el-date-picker clearable v-model="queryParams.endTime" type="date"
+                                value-format="yyyy-MM-dd" placeholder="请选择" style="width: 100%;">
                             </el-date-picker>
                         </el-form-item>
                     </el-col>
@@ -71,7 +71,6 @@
                 </el-form-item>
             </el-form>
         </el-dialog>
-
         <el-row :gutter="10" class="mb8">
             <el-col :span="1.5">
                 <el-button type="primary" plain icon="el-icon-search" size="mini" @click="handleQuerycx">查询</el-button>
@@ -85,8 +84,8 @@
                     v-hasPermi="['system:research:edit']">修改</el-button>
             </el-col>
             <el-col :span="1.5">
-                <el-button type="danger" plain icon="el-icon-delete" size="mini" :disabled="multiple" @click="handleDelete"
-                    v-hasPermi="['system:research:remove']">删除</el-button>
+                <el-button type="danger" plain icon="el-icon-delete" size="mini" :disabled="multiple"
+                    @click="handleDelete" v-hasPermi="['system:research:remove']">删除</el-button>
             </el-col>
             <el-col :span="1.5">
                 <el-button type="warning" plain icon="el-icon-download" size="mini" @click="handleExport"
@@ -94,16 +93,16 @@
             </el-col>
             <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
         </el-row>
-
-        <el-table :row-style="{ height: '1px' }" :cell-style="{ padding: '0px' }"
+        <el-table border :row-style="{ height: '1px' }" :cell-style="{ padding: '0px' }" @sort-change="sortChange"
             :header-cell-style="{ height: '50px', fontSize: '12px', padding: '0 0' }" :data="worksList"
             @selection-change="handleSelectionChange" :default-sort="{ prop: 'awardTime', order: 'descending' }">
             <el-table-column type="selection" width="30" align="center" />
             <el-table-column type="index" label="序号" width="30" align="center" sortable fixed="left" />
-            <el-table-column label="成长类型" align="center" sortable fixed="left" width="80px" show-overflow-tooltip>
+            <el-table-column label="成长类型" align="center" fixed="left" width="80px" show-overflow-tooltip>
                 <span>课题研究</span>
             </el-table-column>
-            <el-table-column label="学科" align="center" prop="sub" sortable fixed="left" width="60px" show-overflow-tooltip>
+            <el-table-column label="学科" align="center" prop="sub" sortable fixed="left" width="60px"
+                show-overflow-tooltip>
                 <template slot-scope="scope">
                     <dict-tag :options="dict.type.teaching_subjects" :value="scope.row.sub" />
                 </template>
@@ -137,12 +136,14 @@
                     <dict-tag :options="dict.type.audit_states" :value="scope.row.auditState" />
                 </template>
             </el-table-column>
-            <el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="160px" fixed="right">
+            <el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="160px"
+                fixed="right">
                 <template slot-scope="scope">
                     <el-button size="mini" type="text" @click="handleUpdate(scope.row)"
                         v-hasPermi="['system:research:edit']"
                         v-if="scope.row.auditState === '0' || scope.row.auditState === '3'">修改</el-button>
-                    <el-button size="mini" type="text" @click="handleLook(scope.row)" v-hasPermi="['system:research:look']"
+                    <el-button size="mini" type="text" @click="handleLook(scope.row)"
+                        v-hasPermi="['system:research:look']"
                         v-if="scope.row.auditState === '0' || scope.row.auditState === '1' || scope.row.auditState === '3' || scope.row.auditState === '2'">查看</el-button>
                     <el-button size="mini" type="text" @click="handleDelete(scope.row)"
                         v-hasPermi="['system:research:remove']"
@@ -154,8 +155,8 @@
             </el-table-column>
         </el-table>
 
-        <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize"
-            @pagination="getList" />
+        <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum"
+            :limit.sync="queryParams.pageSize" @pagination="getList" />
 
         <!-- 添加或修改论文著作对话框 -->
         <el-dialog :title="title" :visible.sync="open" width="1000px" append-to-body>
@@ -164,8 +165,8 @@
                     <el-col :span="12">
                         <el-form-item label="学科" prop="sub">
                             <el-select v-model="form.sub" clearable placeholder="请选择" style="width: 100%;">
-                                <el-option v-for="dict in dict.type.teaching_subjects" :key="dict.value" :label="dict.label"
-                                    :value="dict.value">
+                                <el-option v-for="dict in dict.type.teaching_subjects" :key="dict.value"
+                                    :label="dict.label" :value="dict.value">
                                 </el-option>
                             </el-select>
                         </el-form-item>
@@ -173,8 +174,8 @@
                     <el-col :span="12">
                         <el-form-item label="获奖类别" prop="awardType">
                             <el-select v-model="form.awardType" clearable placeholder="请选择" style="width: 100%;">
-                                <el-option v-for="dict in dict.type.project_research" :key="dict.value" :label="dict.label"
-                                    :value="dict.value">
+                                <el-option v-for="dict in dict.type.project_research" :key="dict.value"
+                                    :label="dict.label" :value="dict.value">
                                 </el-option>
                             </el-select>
                         </el-form-item>
@@ -311,6 +312,8 @@ export default {
             queryParams: {
                 pageNum: 1,
                 pageSize: 10,
+                orderByColumn: "",
+                isAsc: "asc",
                 sub: null,
                 awardType: null,
                 awardRank: null,
@@ -377,6 +380,23 @@ export default {
         this.getList();
     },
     methods: {
+        //排序列
+        sortChange(data) {
+            console.log(data, 'data');
+            const { prop, order } = data
+            //排序列
+            this.queryParams.orderByColumn = prop;
+            //排序顺序ascending或descending
+            // this.queryParams.isAsc = order;
+            if (order == "ascending") {
+                this.queryParams.isAsc = 'asc';
+            } else {
+                this.queryParams.isAsc = 'desc';
+            }
+            //返回第一页
+            this.queryParams.pageNum = 1;
+            this.getList();
+        },
         /** 查询列表 */
         getList() {
             this.loading = true;
@@ -600,7 +620,7 @@ export default {
     }
 };
 </script>
-<style scoped lang="scss" >
+<style scoped lang="scss">
 .avatar-uploader .el-upload {
     border: 1px dashed #d9d9d9;
     border-radius: 6px;
@@ -661,4 +681,9 @@ export default {
     padding: 0;
 
 }
+
+::v-deep.el-table--border .el-table__cell .cell {
+    padding-left: 0px !important;
+
+}
 </style>
\ No newline at end of file

ruoyi-ui/src/views/smartSchool/personWork/teacherAwards/index.vue

@@ -6,8 +6,8 @@
                     <el-col :span="12">
                         <el-form-item label="学科" prop="sub">
                             <el-select v-model="queryParams.sub" clearable placeholder="请选择" style="width: 100%;">
-                                <el-option v-for="dict in dict.type.teaching_subjects" :key="dict.value" :label="dict.label"
-                                    :value="dict.value">
+                                <el-option v-for="dict in dict.type.teaching_subjects" :key="dict.value"
+                                    :label="dict.label" :value="dict.value">
                                 </el-option>
                             </el-select>
                         </el-form-item>
@@ -34,7 +34,8 @@
                     </el-col>
                     <el-col :span="12">
                         <el-form-item label="获奖等级" prop="awardLevel">
-                            <el-select v-model="queryParams.awardLevel" clearable placeholder="请选择" style="width: 100%;">
+                            <el-select v-model="queryParams.awardLevel" clearable placeholder="请选择"
+                                style="width: 100%;">
                                 <el-option v-for="dict in dict.type.award_rank" :key="dict.value" :label="dict.label"
                                     :value="dict.value">
                                 </el-option>
@@ -51,8 +52,8 @@
                     </el-col>
                     <el-col :span="12">
                         <el-form-item label="获奖开始时间" prop="awardTime">
-                            <el-date-picker clearable v-model="queryParams.startTime" type="date" value-format="yyyy-MM-dd"
-                                placeholder="请选择" style="width: 100%;">
+                            <el-date-picker clearable v-model="queryParams.startTime" type="date"
+                                value-format="yyyy-MM-dd" placeholder="请选择" style="width: 100%;">
                             </el-date-picker>
                         </el-form-item>
                     </el-col>
@@ -60,8 +61,8 @@
                 <el-row>
                     <el-col :span="12">
                         <el-form-item label="获奖结束时间" prop="awardTime">
-                            <el-date-picker clearable v-model="queryParams.endTime" type="date" value-format="yyyy-MM-dd"
-                                placeholder="请选择" style="width: 100%;">
+                            <el-date-picker clearable v-model="queryParams.endTime" type="date"
+                                value-format="yyyy-MM-dd" placeholder="请选择" style="width: 100%;">
                             </el-date-picker>
                         </el-form-item>
                     </el-col>
@@ -85,8 +86,8 @@
                     v-hasPermi="['system:awards:edit']">修改</el-button>
             </el-col>
             <el-col :span="1.5">
-                <el-button type="danger" plain icon="el-icon-delete" size="mini" :disabled="multiple" @click="handleDelete"
-                    v-hasPermi="['system:awards:remove']">删除</el-button>
+                <el-button type="danger" plain icon="el-icon-delete" size="mini" :disabled="multiple"
+                    @click="handleDelete" v-hasPermi="['system:awards:remove']">删除</el-button>
             </el-col>
             <el-col :span="1.5">
                 <el-button type="warning" plain icon="el-icon-download" size="mini" @click="handleExport"
@@ -95,7 +96,7 @@
             <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
         </el-row>
 
-        <el-table :row-style="{ height: '1px' }" :cell-style="{ padding: '0px' }"
+        <el-table border :row-style="{ height: '1px' }" :cell-style="{ padding: '0px' }" @sort-change="sortChange"
             :header-cell-style="{ height: '50px', fontSize: '12px', padding: '0 0' }" :data="awardsList"
             @selection-change="handleSelectionChange" :default-sort="{ prop: 'awardTime', order: 'descending' }">
             <el-table-column type="selection" width="30" align="center" />
@@ -105,7 +106,8 @@
                     <span>教学获奖</span>
                 </template>
             </el-table-column>
-            <el-table-column label="学科" align="center" prop="sub" sortable fixed="left" show-overflow-tooltip width="60px">
+            <el-table-column label="学科" align="center" prop="sub" sortable fixed="left" show-overflow-tooltip
+                width="60px">
                 <template slot-scope="scope">
                     <dict-tag :options="dict.type.teaching_subjects" :value="scope.row.sub" />
                 </template>
@@ -142,22 +144,24 @@
             <el-table-column label="操作" align="center" class-name="small-padding fixed-width" fixed="right" width="160px
             ">
                 <template slot-scope="scope">
-                    <el-button size="mini" type="text" @click="handleUpdate(scope.row)" v-hasPermi="['system:awards:edit']"
+                    <el-button size="mini" type="text" @click="handleUpdate(scope.row)"
+                        v-hasPermi="['system:awards:edit']"
                         v-if="scope.row.auditState === '0' || scope.row.auditState === '3'">修改</el-button>
-                    <el-button size="mini" type="text" @click="handleLook(scope.row)" v-hasPermi="['system:awards:look']"
+                    <el-button size="mini" type="text" @click="handleLook(scope.row)"
+                        v-hasPermi="['system:awards:look']"
                         v-if="scope.row.auditState === '0' || scope.row.auditState === '1' || scope.row.auditState === '3' || scope.row.auditState === '2'">查看</el-button>
                     <el-button size="mini" type="text" @click="handleDelete(scope.row)"
                         v-hasPermi="['system:awards:remove']"
                         v-if="scope.row.auditState === '0' || scope.row.auditState === '3'">删除</el-button>
-                    <el-button size="mini" type="text" @click="handleExamine(scope.row)" v-hasPermi="['system:awards:sub']"
-                        v-if="scope.row.auditState === '0'">提交</el-button>
+                    <el-button size="mini" type="text" @click="handleExamine(scope.row)"
+                        v-hasPermi="['system:awards:sub']" v-if="scope.row.auditState === '0'">提交</el-button>
 
                 </template>
             </el-table-column>
         </el-table>
 
-        <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize"
-            @pagination="getList" />
+        <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum"
+            :limit.sync="queryParams.pageSize" @pagination="getList" />
 
         <!-- 添加或修改教师获奖对话框 -->
         <el-dialog :title="title" :visible.sync="open" width="1000px" append-to-body>
@@ -166,8 +170,8 @@
                     <el-col :span="12">
                         <el-form-item label="学科" prop="sub">
                             <el-select v-model="form.sub" clearable placeholder="请选择" style="width: 100%;">
-                                <el-option v-for="dict in dict.type.teaching_subjects" :key="dict.value" :label="dict.label"
-                                    :value="dict.value">
+                                <el-option v-for="dict in dict.type.teaching_subjects" :key="dict.value"
+                                    :label="dict.label" :value="dict.value">
                                 </el-option>
                             </el-select>
                         </el-form-item>
@@ -312,6 +316,8 @@ export default {
             queryParams: {
                 pageNum: 1,
                 pageSize: 10,
+                orderByColumn: "",
+                isAsc: "asc",
                 sub: null,
                 awardType: null,
                 awardRank: null,
@@ -371,6 +377,23 @@ export default {
         this.getList();
     },
     methods: {
+        //排序列
+        sortChange(data) {
+            console.log(data, 'data');
+            const { prop, order } = data
+            //排序列
+            this.queryParams.orderByColumn = prop;
+            //排序顺序ascending或descending
+            // this.queryParams.isAsc = order;
+            if (order == "ascending") {
+                this.queryParams.isAsc = 'asc';
+            } else {
+                this.queryParams.isAsc = 'desc';
+            }
+            //返回第一页
+            this.queryParams.pageNum = 1;
+            this.getList();
+        },
         /** 查询教师获奖列表 */
         getList() {
             this.loading = true;
@@ -594,7 +617,7 @@ export default {
     }
 };
 </script>
-<style scoped lang="scss" >
+<style scoped lang="scss">
 .avatar-uploader .el-upload {
     border: 1px dashed #d9d9d9;
     border-radius: 6px;
@@ -655,4 +678,9 @@ export default {
     padding: 0;
 
 }
+
+::v-deep.el-table--border .el-table__cell .cell {
+    padding-left: 0px !important;
+
+}
 </style>
\ No newline at end of file

ruoyi-ui/src/views/smartSchool/personWork/teamAward/index.vue

@@ -5,7 +5,8 @@
                 <el-row>
                     <el-col :span="12">
                         <el-form-item label="学年" prop="schoolYear">
-                            <el-select v-model="queryParams.schoolYear" clearable placeholder="请选择" style="width: 100%;">
+                            <el-select v-model="queryParams.schoolYear" clearable placeholder="请选择"
+                                style="width: 100%;">
                                 <el-option v-for=" dict in dict.type.yearda" :key="dict.value" :label="dict.label"
                                     :value="dict.value">
                                 </el-option>
@@ -15,8 +16,8 @@
                     <el-col :span="12">
                         <el-form-item label="学期" prop="semester">
                             <el-select v-model="queryParams.semester" clearable placeholder="请选择" style="width: 100%;">
-                                <el-option v-for="dict in dict.type.semester_jsdzda" :key="dict.value" :label="dict.label"
-                                    :value="dict.value">
+                                <el-option v-for="dict in dict.type.semester_jsdzda" :key="dict.value"
+                                    :label="dict.label" :value="dict.value">
                                 </el-option>
                             </el-select>
                         </el-form-item>
@@ -46,8 +47,8 @@
                     <el-col :span="12">
                         <el-form-item label="学科" prop="sub">
                             <el-select v-model="queryParams.sub" clearable placeholder="请选择" style="width: 100%;">
-                                <el-option v-for="dict in dict.type.teaching_subjects" :key="dict.value" :label="dict.label"
-                                    :value="dict.value">
+                                <el-option v-for="dict in dict.type.teaching_subjects" :key="dict.value"
+                                    :label="dict.label" :value="dict.value">
                                 </el-option>
                             </el-select>
                         </el-form-item>
@@ -73,8 +74,8 @@
                     v-hasPermi="['system:teamaward:edit']">修改</el-button>
             </el-col>
             <el-col :span="1.5">
-                <el-button type="danger" plain icon="el-icon-delete" size="mini" :disabled="multiple" @click="handleDelete"
-                    v-hasPermi="['system:teamaward:remove']">删除</el-button>
+                <el-button type="danger" plain icon="el-icon-delete" size="mini" :disabled="multiple"
+                    @click="handleDelete" v-hasPermi="['system:teamaward:remove']">删除</el-button>
             </el-col>
             <el-col :span="1.5">
                 <el-button type="warning" plain icon="el-icon-download" size="mini" @click="handleExport"
@@ -83,9 +84,10 @@
             <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
         </el-row>
 
-        <el-table :row-style="{ height: '1px' }" :cell-style="{ padding: '0px' }"
-            :header-cell-style="{ height: '50px', fontSize: '12px', padding: '0 0' }" v-loading="loading" :data="awardList"
-            @selection-change="handleSelectionChange" :default-sort="{ prop: 'schoolYear', order: 'descending' }">
+        <el-table border :row-style="{ height: '1px' }" :cell-style="{ padding: '0px' }"
+            :header-cell-style="{ height: '50px', fontSize: '12px', padding: '0 0' }" v-loading="loading"
+            :data="awardList" @selection-change="handleSelectionChange"
+            :default-sort="{ prop: 'schoolYear', order: 'descending' }">
             <el-table-column type="selection" width="30" align="center" />
             <el-table-column type="index" label="序号" width="30" align="center" sortable fixed="left" />
             <el-table-column label="学年" align="center" prop="schoolYear" sortable fixed="left" width="80px"
@@ -126,7 +128,8 @@
                     <el-button size="mini" type="text" @click="handleUpdate(scope.row)"
                         v-hasPermi="['system:teamaward:edit']"
                         v-if="scope.row.auditState === '0' || scope.row.auditState === '3'">修改</el-button>
-                    <el-button size="mini" type="text" @click="handleLook(scope.row)" v-hasPermi="['system:teamaward:look']"
+                    <el-button size="mini" type="text" @click="handleLook(scope.row)"
+                        v-hasPermi="['system:teamaward:look']"
                         v-if="scope.row.auditState === '0' || scope.row.auditState === '1' || scope.row.auditState === '3' || scope.row.auditState === '2'">查看</el-button>
                     <el-button size="mini" type="text" @click="handleDelete(scope.row)"
                         v-hasPermi="['system:teamaward:remove']"
@@ -138,8 +141,8 @@
             </el-table-column>
         </el-table>
 
-        <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize"
-            @pagination="getList" />
+        <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum"
+            :limit.sync="queryParams.pageSize" @pagination="getList" />
 
         <!-- 添加或修改团队获奖对话框 -->
         <el-dialog :title="title" :visible.sync="open" width="900px" append-to-body>
@@ -157,8 +160,8 @@
                     <el-col :span="12">
                         <el-form-item label="学期" prop="semester">
                             <el-select v-model="form.semester" clearable placeholder="请选择" style="width: 100%;">
-                                <el-option v-for="dict in dict.type.semester_jsdzda" :key="dict.value" :label="dict.label"
-                                    :value="dict.value">
+                                <el-option v-for="dict in dict.type.semester_jsdzda" :key="dict.value"
+                                    :label="dict.label" :value="dict.value">
                                 </el-option>
                             </el-select>
                         </el-form-item>
@@ -188,8 +191,8 @@
                     <el-col :span="12">
                         <el-form-item label="学科" prop="sub">
                             <el-select v-model="form.sub" clearable placeholder="请选择" style="width: 100%;">
-                                <el-option v-for="dict in dict.type.teaching_subjects" :key="dict.value" :label="dict.label"
-                                    :value="dict.value">
+                                <el-option v-for="dict in dict.type.teaching_subjects" :key="dict.value"
+                                    :label="dict.label" :value="dict.value">
                                 </el-option>
                             </el-select>
                         </el-form-item>
@@ -495,4 +498,9 @@ export default {
     padding: 0;
 
 }
+
+::v-deep.el-table--border .el-table__cell .cell {
+    padding-left: 0px !important;
+
+}
 </style>
\ No newline at end of file

ruoyi-ui/src/views/smartSchool/personWork/tutorAward/index.vue

@@ -6,8 +6,8 @@
                     <el-col :span="12">
                         <el-form-item label="学科" prop="sub">
                             <el-select v-model="queryParams.sub" clearable placeholder="请选择" style="width: 100%;">
-                                <el-option v-for="dict in dict.type.teaching_subjects" :key="dict.value" :label="dict.label"
-                                    :value="dict.value">
+                                <el-option v-for="dict in dict.type.teaching_subjects" :key="dict.value"
+                                    :label="dict.label" :value="dict.value">
                                 </el-option>
                             </el-select>
                         </el-form-item>
@@ -15,8 +15,8 @@
                     <el-col :span="12">
                         <el-form-item label="获奖类别" prop="awardtype">
                             <el-select v-model="queryParams.awardtype" clearable placeholder="请选择" style="width: 100%;">
-                                <el-option v-for="dict in dict.type.award_type_fdjs" :key="dict.value" :label="dict.label"
-                                    :value="dict.value">
+                                <el-option v-for="dict in dict.type.award_type_fdjs" :key="dict.value"
+                                    :label="dict.label" :value="dict.value">
                                 </el-option>
                             </el-select>
                         </el-form-item>
@@ -34,7 +34,8 @@
                     </el-col>
                     <el-col :span="12">
                         <el-form-item label="获奖等级" prop="awardlevel">
-                            <el-select v-model="queryParams.awardlevel" clearable placeholder="请选择" style="width: 100%;">
+                            <el-select v-model="queryParams.awardlevel" clearable placeholder="请选择"
+                                style="width: 100%;">
                                 <el-option v-for="dict in dict.type.award_rank" :key="dict.value" :label="dict.label"
                                     :value="dict.value">
                                 </el-option>
@@ -67,8 +68,8 @@
                     </el-col>
                     <el-col :span="12">
                         <el-form-item label="获奖开始时间" prop="startTime">
-                            <el-date-picker clearable v-model="queryParams.startTime" type="date" value-format="yyyy-MM-dd"
-                                placeholder="请选择" style="width: 100%;">
+                            <el-date-picker clearable v-model="queryParams.startTime" type="date"
+                                value-format="yyyy-MM-dd" placeholder="请选择" style="width: 100%;">
                             </el-date-picker>
                         </el-form-item>
                     </el-col>
@@ -76,8 +77,8 @@
                 <el-row>
                     <el-col :span="12">
                         <el-form-item label="获奖结束时间" prop="endTime">
-                            <el-date-picker clearable v-model="queryParams.endTime" type="date" value-format="yyyy-MM-dd"
-                                placeholder="请选择" style="width: 100%;">
+                            <el-date-picker clearable v-model="queryParams.endTime" type="date"
+                                value-format="yyyy-MM-dd" placeholder="请选择" style="width: 100%;">
                             </el-date-picker>
                         </el-form-item>
                     </el-col>
@@ -101,8 +102,8 @@
                     v-hasPermi="['system:tutoraward:edit']">修改</el-button>
             </el-col>
             <el-col :span="1.5">
-                <el-button type="danger" plain icon="el-icon-delete" size="mini" :disabled="multiple" @click="handleDelete"
-                    v-hasPermi="['system:tutoraward:remove']">删除</el-button>
+                <el-button type="danger" plain icon="el-icon-delete" size="mini" :disabled="multiple"
+                    @click="handleDelete" v-hasPermi="['system:tutoraward:remove']">删除</el-button>
             </el-col>
             <el-col :span="1.5">
                 <el-button type="warning" plain icon="el-icon-download" size="mini" @click="handleExport"
@@ -111,7 +112,7 @@
             <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
         </el-row>
 
-        <el-table :row-style="{ height: '1px' }" :cell-style="{ padding: '0px' }"
+        <el-table border :row-style="{ height: '1px' }" :cell-style="{ padding: '0px' }"
             :header-cell-style="{ height: '50px', fontSize: '12px', padding: '0 0' }" :data="awardsList"
             @selection-change="handleSelectionChange" :default-sort="{ prop: 'awardtime', order: 'descending' }">
             <el-table-column type="selection" width="30" align="center" />
@@ -121,7 +122,8 @@
                     <span>辅导老师获奖</span>
                 </template>
             </el-table-column>
-            <el-table-column label="学科" align="center" prop="sub" sortable fixed="left" width="50px" show-overflow-tooltip>
+            <el-table-column label="学科" align="center" prop="sub" sortable fixed="left" width="50px"
+                show-overflow-tooltip>
                 <template slot-scope="scope">
                     <dict-tag :options="dict.type.teaching_subjects" :value="scope.row.sub" />
                 </template>
@@ -131,18 +133,17 @@
                     <dict-tag :options="dict.type.award_type_fdjs" :value="scope.row.awardtype" />
                 </template>
             </el-table-column>
-            <el-table-column label="获奖等级" align="center" prop="awardlevel" sortable width="80px" show-overflow-tooltip>
+            <el-table-column label="获奖等级" align="center" prop="awardlevel" sortable width="100px" show-overflow-tooltip>
                 <template slot-scope="scope">
                     <dict-tag :options="dict.type.award_rank" :value="scope.row.awardlevel" />
                 </template>
             </el-table-column>
-            <el-table-column label="获奖级别" align="center" prop="awardrank" sortable width="80px" show-overflow-tooltip>
+            <el-table-column label="获奖级别" align="center" prop="awardrank" sortable width="100px" show-overflow-tooltip>
                 <template slot-scope="scope">
                     <dict-tag :options="dict.type.awards_level" :value="scope.row.awardrank" />
                 </template>
             </el-table-column>
-            <el-table-column label="比赛名称" align="center" prop="competitionname" sortable width="130px"
-                show-overflow-tooltip />
+            <el-table-column label="比赛名称" align="center" prop="competitionname" sortable show-overflow-tooltip />
             <el-table-column label="获奖人" align="center" prop="username" sortable width="70px" show-overflow-tooltip />
             <el-table-column label="指导教师" align="center" prop="guidanceteacher" sortable width="80px"
                 show-overflow-tooltip />
@@ -151,8 +152,8 @@
                     <dict-tag :options="dict.type.coachingr" :value="scope.row.coachingr" />
                 </template>
             </el-table-column>
-            <el-table-column label="主办单位" align="center" prop="org" sortable width="100px" show-overflow-tooltip />
-            <el-table-column label="获奖时间" align="center" prop="awardtime" sortable show-overflow-tooltip>
+            <el-table-column label="主办单位" align="center" prop="org" sortable width="110px" show-overflow-tooltip />
+            <el-table-column label="获奖时间" align="center" prop="awardtime" width="100px" sortable show-overflow-tooltip>
                 <!-- <template slot-scope="scope">
                     <span>{{ parseTime(scope.row.awardTime, '{y}-{m}-{d}') }}</span>
                 </template> -->
@@ -162,7 +163,8 @@
                     <dict-tag :options="dict.type.audit_states" :value="scope.row.auditstate" />
                 </template>
             </el-table-column>
-            <el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="160px" fixed="right">
+            <el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="160px"
+                fixed="right">
                 <template slot-scope="scope">
                     <el-button size="mini" type="text" @click="handleUpdate(scope.row)"
                         v-hasPermi="['system:tutoraward:edit']"
@@ -179,8 +181,8 @@
                 </template>
             </el-table-column>
         </el-table>
-        <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize"
-            @pagination="getList" />
+        <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum"
+            :limit.sync="queryParams.pageSize" @pagination="getList" />
 
         <!-- 添加或修改教师获奖对话框 -->
         <el-dialog :title="title" :visible.sync="open" width="1000px" append-to-body>
@@ -189,8 +191,8 @@
                     <el-col :span="12">
                         <el-form-item label="学科" prop="sub">
                             <el-select v-model="form.sub" clearable placeholder="请选择" style="width: 100%;">
-                                <el-option v-for="dict in dict.type.teaching_subjects" :key="dict.value" :label="dict.label"
-                                    :value="dict.value">
+                                <el-option v-for="dict in dict.type.teaching_subjects" :key="dict.value"
+                                    :label="dict.label" :value="dict.value">
                                 </el-option>
                             </el-select>
                         </el-form-item>
@@ -198,8 +200,8 @@
                     <el-col :span="12">
                         <el-form-item label="获奖类别" prop="awardtype">
                             <el-select v-model="form.awardtype" clearable placeholder="请选择" style="width: 100%;">
-                                <el-option v-for="dict in dict.type.award_type_fdjs" :key="dict.value" :label="dict.label"
-                                    :value="dict.value">
+                                <el-option v-for="dict in dict.type.award_type_fdjs" :key="dict.value"
+                                    :label="dict.label" :value="dict.value">
                                 </el-option>
                             </el-select>
                         </el-form-item>
@@ -649,7 +651,7 @@ export default {
     }
 };
 </script>
-<style scoped lang="scss" >
+<style scoped lang="scss">
 .avatar-uploader .el-upload {
     border: 1px dashed #d9d9d9;
     border-radius: 6px;
@@ -710,4 +712,9 @@ export default {
     padding: 0;
 
 }
+
+::v-deep.el-table--border .el-table__cell .cell {
+    padding-left: 0px !important;
+
+}
 </style>