From 70d5ec51b8e7e839969f150cf365ac7a3dbaf0c0 Mon Sep 17 00:00:00 2001
From: zhanglipeng <chinazhanglipeng@qq.com>
Date: Fri, 23 Jul 2021 09:31:49 +0800
Subject: [PATCH] =?UTF-8?q?=E6=95=99=E5=B8=88=E6=9C=88=E7=BB=A9=E6=95=88?=
 =?UTF-8?q?=E8=80=83=E6=A0=B8-=E6=A0=B9=E6=8D=AE=E6=9C=88=E4=BB=BD?=
 =?UTF-8?q?=E5=92=8C=E6=95=99=E5=B8=88=E8=87=AA=E5=8A=A8=E8=8E=B7=E5=8F=96?=
 =?UTF-8?q?=E4=B8=80=E6=97=A5=E6=B5=81=E7=A8=8B=E5=BE=97=E5=88=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../views/benyi/teacherassessment/index.vue   | 26 ++++++++++++++++---
 .../impl/ByTeacherassessmentServiceImpl.java  |  2 ++
 .../benyi/ByTeacherassessmentMapper.xml       |  2 ++
 3 files changed, 27 insertions(+), 3 deletions(-)

diff --git a/ruoyi-ui/src/views/benyi/teacherassessment/index.vue b/ruoyi-ui/src/views/benyi/teacherassessment/index.vue
index d81e9716d..80562c49b 100644
--- a/ruoyi-ui/src/views/benyi/teacherassessment/index.vue
+++ b/ruoyi-ui/src/views/benyi/teacherassessment/index.vue
@@ -100,6 +100,7 @@
     <el-table
       v-loading="loading"
       :data="teacherassessmentList"
+      border
       @selection-change="handleSelectionChange"
     >
       <el-table-column type="selection" width="55" align="center" />
@@ -109,12 +110,13 @@
         align="center"
         prop="classid"
         :formatter="classFormat"
+        fixed
       />
       <el-table-column
         label="教师"
         align="center"
         prop="sysUser.nickName"
-        
+        fixed
       />
       <el-table-column label="考核月份" align="center" prop="month" />
       <el-table-column label="一日流程" align="center" prop="yrlcbl" />
@@ -125,8 +127,9 @@
       <el-table-column label="总分" align="center" prop="zfbl" />
       <el-table-column
         label="操作"
+        fixed="right"
         align="center"
-        class-name="small-padding fixed-width"
+        class-name="small-padding fixed-width edit-btns"
       >
         <template slot-scope="scope">
           <el-button
@@ -522,4 +525,21 @@ export default {
     },
   },
 };
-</script>
\ No newline at end of file
+</script>
+<style lang="scss" scoped>
+.el-select {
+  width: 100%;
+}
+.my-date-picker {
+  width: 100%;
+}
+.edit-btns {
+  .el-button {
+    display: block;
+    margin: 0 auto;
+  }
+}
+.no-margin ::v-deep.el-form-item__content {
+  margin: 0 !important;
+}
+</style>
\ No newline at end of file
diff --git a/ruoyi/src/main/java/com/ruoyi/project/benyi/service/impl/ByTeacherassessmentServiceImpl.java b/ruoyi/src/main/java/com/ruoyi/project/benyi/service/impl/ByTeacherassessmentServiceImpl.java
index e730bd503..376d519b3 100644
--- a/ruoyi/src/main/java/com/ruoyi/project/benyi/service/impl/ByTeacherassessmentServiceImpl.java
+++ b/ruoyi/src/main/java/com/ruoyi/project/benyi/service/impl/ByTeacherassessmentServiceImpl.java
@@ -3,6 +3,7 @@ package com.ruoyi.project.benyi.service.impl;
 import java.util.List;
 
 import com.ruoyi.common.utils.DateUtils;
+import com.ruoyi.framework.aspectj.lang.annotation.DataScope;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import com.ruoyi.project.benyi.mapper.ByTeacherassessmentMapper;
@@ -38,6 +39,7 @@ public class ByTeacherassessmentServiceImpl implements IByTeacherassessmentServi
      * @return 教师月绩效考核
      */
     @Override
+    @DataScope(deptAlias = "a")
     public List<ByTeacherassessment> selectByTeacherassessmentList(ByTeacherassessment byTeacherassessment) {
         return byTeacherassessmentMapper.selectByTeacherassessmentList(byTeacherassessment);
     }
diff --git a/ruoyi/src/main/resources/mybatis/benyi/ByTeacherassessmentMapper.xml b/ruoyi/src/main/resources/mybatis/benyi/ByTeacherassessmentMapper.xml
index c9d3ae51b..02829c6c3 100644
--- a/ruoyi/src/main/resources/mybatis/benyi/ByTeacherassessmentMapper.xml
+++ b/ruoyi/src/main/resources/mybatis/benyi/ByTeacherassessmentMapper.xml
@@ -46,6 +46,8 @@
             <if test="wsbl != null ">and a.wsbl = #{wsbl}</if>
             <if test="zfbl != null ">and a.zfbl = #{zfbl}</if>
         </where>
+        <!-- 数据范围过滤 -->
+        ${dataScope}
         order by a.create_time desc
     </select>