From ee09c0491e382b9f95063d6dbb9998d72c47bef8 Mon Sep 17 00:00:00 2001
From: zhanglipeng <chinazhanglipeng@qq.com>
Date: Mon, 19 Apr 2021 08:48:27 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=80=E6=97=A5=E6=B5=81=E7=A8=8B=E8=AF=84?=
 =?UTF-8?q?=E4=BC=B0=E7=8F=AD=E7=BA=A7=E8=AF=84=E4=BC=B0=E7=BB=93=E6=9E=9C?=
 =?UTF-8?q?=E6=9F=A5=E7=9C=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../benyi/dayflowassessmentpjf/index.vue      | 36 +++++++------------
 .../dayflowassessmentteacherpjf/index.vue     | 36 ++++++++++---------
 2 files changed, 33 insertions(+), 39 deletions(-)

diff --git a/ruoyi-ui/src/views/benyi/dayflowassessmentpjf/index.vue b/ruoyi-ui/src/views/benyi/dayflowassessmentpjf/index.vue
index a1bce8c71..653fe4c99 100644
--- a/ruoyi-ui/src/views/benyi/dayflowassessmentpjf/index.vue
+++ b/ruoyi-ui/src/views/benyi/dayflowassessmentpjf/index.vue
@@ -1,12 +1,11 @@
 <template>
   <div class="app-container">
-
-<el-form
+    <el-form
       :model="queryParams"
       ref="queryForm"
       :inline="true"
       label-width="70px"
-    >  
+    >
       <el-form-item label="选择月份" prop="createTime">
         <el-date-picker
           clearable
@@ -19,7 +18,7 @@
         >
         </el-date-picker>
       </el-form-item>
-      
+
       <el-form-item>
         <el-button
           type="primary"
@@ -34,20 +33,15 @@
       </el-form-item>
     </el-form>
 
-    <el-table
-      v-loading="loading"
-      :data="dayflowassessmentList"
-      @selection-change="handleSelectionChange"
-    >
-      <el-table-column type="selection" width="55" align="center" />
-      <!-- <el-table-column label="所属计划" align="center" prop="planid" :formatter="planFormat"/> -->
+    <el-table v-loading="loading" border :data="dayflowassessmentList">
       <el-table-column
         label="班级名称"
         align="center"
+        fixed
         prop="classid"
         :formatter="classFormat"
       />
-      <el-table-column label="班级综合平均分1" align="center" prop="bjpjf" />
+      <el-table-column label="班级综合平均分" align="center" prop="bjpjf" />
       <el-table-column label="早间接待" align="center" prop="zjjdpjf" />
       <el-table-column label="用餐" align="center" prop="ycpjf" />
       <el-table-column label="早间坐圈" align="center" prop="zjzqpjf" />
@@ -60,7 +54,11 @@
       <el-table-column label="离园再见" align="center" prop="lyzjpjf" />
       <el-table-column label="安全" align="center" prop="aqpjf" />
       <el-table-column label="自由活动" align="center" prop="zyhdpjf" />
-      <el-table-column label="规则与纪律约束" align="center" prop="gzyjlyspjf" />
+      <el-table-column
+        label="规则与纪律约束"
+        align="center"
+        prop="gzyjlyspjf"
+      />
       <el-table-column label="微型课程" align="center" prop="wxkcpjf" />
       <el-table-column label="潜课程" align="center" prop="qkcpjf" />
     </el-table>
@@ -76,9 +74,7 @@
 </template>
 
 <script>
-import {
-  listDayflowassessmentPjf
-} from "@/api/benyi/dayflowassessment";
+import { listDayflowassessmentPjf } from "@/api/benyi/dayflowassessment";
 import { listClass } from "@/api/system/class";
 
 export default {
@@ -121,7 +117,7 @@ export default {
         pgdx: undefined,
         classdf: undefined,
         createUserid: undefined,
-        createTime: undefined
+        createTime: undefined,
       },
       // 表单参数
       form: {},
@@ -169,12 +165,6 @@ export default {
       this.resetForm("queryForm");
       this.handleQuery();
     },
-    // 多选框选中数据
-    handleSelectionChange(selection) {
-      this.ids = selection.map((item) => item.id);
-      this.single = selection.length != 1;
-      this.multiple = !selection.length;
-    },
   },
 };
 </script>
\ No newline at end of file
diff --git a/ruoyi-ui/src/views/benyi/dayflowassessmentteacherpjf/index.vue b/ruoyi-ui/src/views/benyi/dayflowassessmentteacherpjf/index.vue
index ebfef4be3..e46b25808 100644
--- a/ruoyi-ui/src/views/benyi/dayflowassessmentteacherpjf/index.vue
+++ b/ruoyi-ui/src/views/benyi/dayflowassessmentteacherpjf/index.vue
@@ -6,31 +6,33 @@
       :inline="true"
       label-width="70px"
     >
-      <el-form-item label="学年学期" prop="xnxq">
-        <el-select v-model="queryParams.xnxq" placeholder="请选择学年学期">
-          <el-option
-            v-for="dict in xnxqOptions"
-            :key="dict.dictValue"
-            :label="dict.dictLabel"
-            :value="dict.dictValue"
-          />
-        </el-select>
-      </el-form-item>
-      <el-form-item label="班级名称" prop="classid">
+      <el-form-item label="教师姓名" prop="classid">
         <el-select
           v-model="queryParams.classid"
           clearable
           size="small"
-          placeholder="请选择班级"
+          placeholder="请选择教师"
         >
           <el-option
-            v-for="dict in classOptions"
-            :key="dict.bjbh"
-            :label="dict.bjmc"
-            :value="dict.bjbh"
+            v-for="dict in userOptions"
+            :key="dict.userId"
+            :label="dict.nickName"
+            :value="dict.userId"
           ></el-option>
         </el-select>
       </el-form-item>
+      <el-form-item label="评估时间">
+        <el-date-picker
+          v-model="dateRange"
+          size="small"
+          class="my-date-picker"
+          value-format="yyyy-MM-dd"
+          type="daterange"
+          range-separator="-"
+          start-placeholder="开始日期"
+          end-placeholder="结束日期"
+        ></el-date-picker>
+      </el-form-item>
       <el-form-item>
         <el-button
           type="primary"
@@ -115,6 +117,8 @@ export default {
       classOptions: [],
       // 学年学期
       xnxqOptions: [],
+      // 日期范围
+      dateRange: [],
       // 所有教师
       userOptions: [],
       // 查询参数