一日流程评估 优化

ruoyi-ui/src/views/benyi/dayflowassessmentpjf/index.vue

@@ -1,16 +1,13 @@
 <template>
   <div class="app-container">
-    <el-form
+    <el-form :model="queryParams" ref="queryForm" label-width="70px">
-      :model="queryParams"
+      <el-row :gutter="10">
-      ref="queryForm"
+        <el-col :xs="24" :ms="12" :md="5">
-      :inline="true"
-      label-width="70px"
-    >
           <el-form-item label="选择月份" prop="createTime">
             <el-date-picker
               clearable
               size="small"
-          style="width: 200px"
+              class="my-date-picker"
               v-model="queryParams.createTime"
               type="month"
               value-format="yyyy-MM-dd"
@@ -18,7 +15,8 @@
             >
             </el-date-picker>
           </el-form-item>
-
+        </el-col>
+        <el-col :xs="24" :ms="12" :md="5">
           <el-form-item>
             <el-button
               type="primary"
@@ -31,9 +29,16 @@
               >重置</el-button
             >
           </el-form-item>
+        </el-col>
+      </el-row>
     </el-form>
 
-    <el-table v-loading="loading" border :default-sort = "{prop: 'bjpjf', order: 'descending'}" :data="dayflowassessmentList">
+    <el-table
+      v-loading="loading"
+      border
+      :default-sort="{ prop: 'bjpjf', order: 'descending' }"
+      :data="dayflowassessmentList"
+    >
       <el-table-column
         label="班级名称"
         align="center"
@@ -41,26 +46,118 @@
         prop="classid"
         :formatter="classFormat"
       />
-      <el-table-column label="班级平均分" align="center" prop="bjpjf" sortable width="110"/>
+      <el-table-column
-      <el-table-column label="早间接待" align="center" prop="zjjdpjf" sortable width="110"/>
+        label="班级平均分"
-      <el-table-column label="用餐" align="center" prop="ycpjf" sortable width="80"/>
+        align="center"
-      <el-table-column label="早间坐圈" align="center" prop="zjzqpjf" sortable width="110"/>
+        prop="bjpjf"
-      <el-table-column label="分组教学" align="center" prop="fzjxpjf" sortable width="110"/>
+        sortable
-      <el-table-column label="点心时间" align="center" prop="dxsjpjf" sortable width="110"/>
+        width="110"
-      <el-table-column label="如厕洗手饮水" align="center" prop="rcxsyspjf" sortable width="130"/>
+      />
-      <el-table-column label="活动过渡" align="center" prop="hdgdpjf" sortable width="110"/>
+      <el-table-column
-      <el-table-column label="户外活动" align="center" prop="hwhdpjf" sortable width="110"/>
+        label="早间接待"
-      <el-table-column label="午睡" align="center" prop="wspjf" sortable width="80"/>
+        align="center"
-      <el-table-column label="离园再见" align="center" prop="lyzjpjf" sortable width="110"/>
+        prop="zjjdpjf"
-      <el-table-column label="安全" align="center" prop="aqpjf" sortable width="80"/>
+        sortable
-      <el-table-column label="自由活动" align="center" prop="zyhdpjf" sortable width="110"/>
+        width="110"
+      />
+      <el-table-column
+        label="用餐"
+        align="center"
+        prop="ycpjf"
+        sortable
+        width="80"
+      />
+      <el-table-column
+        label="早间坐圈"
+        align="center"
+        prop="zjzqpjf"
+        sortable
+        width="110"
+      />
+      <el-table-column
+        label="分组教学"
+        align="center"
+        prop="fzjxpjf"
+        sortable
+        width="110"
+      />
+      <el-table-column
+        label="点心时间"
+        align="center"
+        prop="dxsjpjf"
+        sortable
+        width="110"
+      />
+      <el-table-column
+        label="如厕洗手饮水"
+        align="center"
+        prop="rcxsyspjf"
+        sortable
+        width="130"
+      />
+      <el-table-column
+        label="活动过渡"
+        align="center"
+        prop="hdgdpjf"
+        sortable
+        width="110"
+      />
+      <el-table-column
+        label="户外活动"
+        align="center"
+        prop="hwhdpjf"
+        sortable
+        width="110"
+      />
+      <el-table-column
+        label="午睡"
+        align="center"
+        prop="wspjf"
+        sortable
+        width="80"
+      />
+      <el-table-column
+        label="离园再见"
+        align="center"
+        prop="lyzjpjf"
+        sortable
+        width="110"
+      />
+      <el-table-column
+        label="安全"
+        align="center"
+        prop="aqpjf"
+        sortable
+        width="80"
+      />
+      <el-table-column
+        label="自由活动"
+        align="center"
+        prop="zyhdpjf"
+        sortable
+        width="110"
+      />
       <el-table-column
         label="规则与纪律约束"
         align="center"
-        prop="gzyjlyspjf" sortable width="140"
+        prop="gzyjlyspjf"
+        sortable
+        width="140"
+      />
+      <el-table-column
+        label="微型课程"
+        align="center"
+        prop="wxkcpjf"
+        sortable
+        width="110"
+      />
+      <el-table-column
+        label="潜课程"
+        align="center"
+        prop="qkcpjf"
+        sortable
+        width="100"
       />
-      <el-table-column label="微型课程" align="center" prop="wxkcpjf" sortable width="110"/>
-      <el-table-column label="潜课程" align="center" prop="qkcpjf" sortable width="100"/>
     </el-table>
 
     <pagination
@@ -179,3 +276,20 @@ export default {
   },
 };
 </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>

ruoyi-ui/src/views/benyi/dayflowassessmentteacher/index.vue

@@ -1,12 +1,7 @@
 <template>
   <div class="app-container">
-    <el-form
+    <el-form :model="queryParams" ref="queryForm" label-width="70px">
-      :model="queryParams"
+      <!-- <el-form-item label="学年学期" prop="xnxq">
-      ref="queryForm"
-      :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"
@@ -15,7 +10,23 @@
             :value="dict.dictValue"
           />
         </el-select>
+      </el-form-item> -->
+      <el-row :gutter="10">
+        <el-col :xs="24" :ms="12" :md="5">
+          <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-col>
+        <el-col :xs="24" :ms="12" :md="5">
           <el-form-item label="班级名称" prop="classid">
             <el-select
               v-model="queryParams.classid"
@@ -31,18 +42,25 @@
               ></el-option>
             </el-select>
           </el-form-item>
-      <el-form-item label="评估时间">
+        </el-col>
-        <el-date-picker
+        <el-col :xs="24" :ms="12" :md="5">
-          v-model="dateRange"
+          <el-form-item label="选择教师" prop="pgdx">
+            <el-select
+              v-model="queryParams.pgdx"
+              clearable
               size="small"
-          class="my-date-picker"
+              placeholder="请选择教师"
-          value-format="yyyy-MM-dd"
+            >
-          type="daterange"
+              <el-option
-          range-separator="-"
+                v-for="dict in userOptions"
-          start-placeholder="开始日期"
+                :key="dict.userId"
-          end-placeholder="结束日期"
+                :label="dict.nickName"
-        ></el-date-picker>
+                :value="dict.userId"
+              ></el-option>
+            </el-select>
           </el-form-item>
+        </el-col>
+        <el-col :xs="24" :ms="12" :md="5">
           <el-form-item>
             <el-button
               type="primary"
@@ -55,6 +73,8 @@
               >重置</el-button
             >
           </el-form-item>
+        </el-col>
+      </el-row>
     </el-form>
 
     <el-table v-loading="loading" border :data="dayflowassessmentList">
@@ -191,7 +211,7 @@ import {
   getDayflowassessment,
   delDayflowassessment,
 } from "@/api/benyi/dayflowassessment";
-import { listClass } from "@/api/system/class";
+import { listClass, getUserList } from "@/api/system/class";
 import { listUser } from "@/api/system/user";
 import { listDetail, getDetail } from "@/api/benyi/dayflow/dayflowmanger";
 
@@ -217,6 +237,8 @@ export default {
       xnxqOptions: [],
       // 所有教师
       userOptions: [],
+      // 所有教师
+      userAllOptions: [],
       // 日期范围
       dateRange: [],
       // 查询参数
@@ -246,6 +268,17 @@ export default {
       form: {},
     };
   },
+  watch: {
+    "queryParams.classid": function (val) {
+      //console.log(val);
+      if (val != "undefined") {
+        getUserList(val).then((response) => {
+          //console.log(response);
+          this.userOptions = response.rows;
+        });
+      }
+    },
+  },
   created() {
     this.getList();
     this.getClassList();
@@ -292,13 +325,13 @@ export default {
     /** 查询用户列表 */
     getUserList() {
       listUser(null).then((response) => {
-        this.userOptions = response.rows;
+        this.userAllOptions = response.rows;
       });
     },
     // 教师字典翻译
     pgdxFormat(row, column) {
       var actions = [];
-      var datas = this.userOptions;
+      var datas = this.userAllOptions;
       Object.keys(datas).map((key) => {
         if (datas[key].userId == "" + row.pgdx) {
           actions.push(datas[key].nickName);
@@ -332,8 +365,26 @@ export default {
     resetQuery() {
       this.resetForm("queryForm");
       this.dateRange = [];
+      this.userOptions = this.userAllOptions;
       this.handleQuery();
     },
   },
 };
 </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>

ruoyi-ui/src/views/benyi/dayflowassessmentteacherpjf/index.vue

@@ -1,11 +1,22 @@
 <template>
   <div class="app-container">
-    <el-form
+    <el-form :model="queryParams" ref="queryForm" label-width="70px">
-      :model="queryParams"
+      <el-row :gutter="10">
-      ref="queryForm"
+        <el-col :xs="24" :ms="12" :md="5">
-      :inline="true"
+          <el-form-item label="评估时间">
-      label-width="70px"
+            <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-col>
+        <el-col :xs="24" :ms="12" :md="5">
           <el-form-item label="教师姓名" prop="pgdx">
             <el-select
               v-model="queryParams.pgdx"
@@ -21,18 +32,8 @@
               ></el-option>
             </el-select>
           </el-form-item>
-      <el-form-item label="评估时间">
+        </el-col>
-        <el-date-picker
+        <el-col :xs="24" :ms="12" :md="5">
-          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"
@@ -45,30 +46,129 @@
               >重置</el-button
             >
           </el-form-item>
+        </el-col>
+      </el-row>
     </el-form>
 
-    <el-table v-loading="loading" border :default-sort = "{prop: 'bjpjf', order: 'descending'}" :data="dayflowassessmentList">
+    <el-table
+      v-loading="loading"
+      border
+      :default-sort="{ prop: 'bjpjf', order: 'descending' }"
+      :data="dayflowassessmentList"
+    >
       <el-table-column label="评估对象" align="center" prop="pgdxxm" fixed />
-      <el-table-column label="最终扣分" align="center" prop="bjpjf" sortable width="110"/>
+      <el-table-column
-      <el-table-column label="早间接待" align="center" prop="zjjdpjf" sortable width="110"/>
+        label="最终扣分"
-      <el-table-column label="用餐" align="center" prop="ycpjf" sortable width="80"/>
+        align="center"
-      <el-table-column label="早间坐圈" align="center" prop="zjzqpjf" sortable width="110"/>
+        prop="bjpjf"
-      <el-table-column label="分组教学" align="center" prop="fzjxpjf" sortable width="110"/>
+        sortable
-      <el-table-column label="点心时间" align="center" prop="dxsjpjf" sortable width="110"/>
+        width="110"
-      <el-table-column label="如厕洗手饮水" align="center" prop="rcxsyspjf" sortable width="130"/>
+      />
-      <el-table-column label="活动过渡" align="center" prop="hdgdpjf" sortable width="110"/>
+      <el-table-column
-      <el-table-column label="户外活动" align="center" prop="hwhdpjf" sortable width="110"/>
+        label="早间接待"
-      <el-table-column label="午睡" align="center" prop="wspjf" sortable width="80"/>
+        align="center"
-      <el-table-column label="离园再见" align="center" prop="lyzjpjf" sortable width="110"/>
+        prop="zjjdpjf"
-      <el-table-column label="安全" align="center" prop="aqpjf" sortable width="80"/>
+        sortable
-      <el-table-column label="自由活动" align="center" prop="zyhdpjf" sortable width="110"/>
+        width="110"
+      />
+      <el-table-column
+        label="用餐"
+        align="center"
+        prop="ycpjf"
+        sortable
+        width="80"
+      />
+      <el-table-column
+        label="早间坐圈"
+        align="center"
+        prop="zjzqpjf"
+        sortable
+        width="110"
+      />
+      <el-table-column
+        label="分组教学"
+        align="center"
+        prop="fzjxpjf"
+        sortable
+        width="110"
+      />
+      <el-table-column
+        label="点心时间"
+        align="center"
+        prop="dxsjpjf"
+        sortable
+        width="110"
+      />
+      <el-table-column
+        label="如厕洗手饮水"
+        align="center"
+        prop="rcxsyspjf"
+        sortable
+        width="130"
+      />
+      <el-table-column
+        label="活动过渡"
+        align="center"
+        prop="hdgdpjf"
+        sortable
+        width="110"
+      />
+      <el-table-column
+        label="户外活动"
+        align="center"
+        prop="hwhdpjf"
+        sortable
+        width="110"
+      />
+      <el-table-column
+        label="午睡"
+        align="center"
+        prop="wspjf"
+        sortable
+        width="80"
+      />
+      <el-table-column
+        label="离园再见"
+        align="center"
+        prop="lyzjpjf"
+        sortable
+        width="110"
+      />
+      <el-table-column
+        label="安全"
+        align="center"
+        prop="aqpjf"
+        sortable
+        width="80"
+      />
+      <el-table-column
+        label="自由活动"
+        align="center"
+        prop="zyhdpjf"
+        sortable
+        width="110"
+      />
       <el-table-column
         label="规则与纪律约束"
         align="center"
-        prop="gzyjlyspjf" sortable width="140"
+        prop="gzyjlyspjf"
+        sortable
+        width="140"
+      />
+      <el-table-column
+        label="微型课程"
+        align="center"
+        prop="wxkcpjf"
+        sortable
+        width="110"
+      />
+      <el-table-column
+        label="潜课程"
+        align="center"
+        prop="qkcpjf"
+        sortable
+        width="100"
       />
-      <el-table-column label="微型课程" align="center" prop="wxkcpjf" sortable width="110"/>
-      <el-table-column label="潜课程" align="center" prop="qkcpjf" sortable width="100"/>
     </el-table>
 
     <pagination
@@ -209,3 +309,20 @@ export default {
   },
 };
 </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>

ruoyi-ui/src/views/benyi/teacherassessment/index.vue

@@ -1,11 +1,8 @@
 <template>
   <div class="app-container">
-    <el-form
+    <el-form :model="queryParams" ref="queryForm" label-width="70px">
-      :model="queryParams"
+      <el-row :gutter="10">
-      ref="queryForm"
+        <el-col :xs="24" :ms="12" :md="5">
-      :inline="true"
-      label-width="70px"
-    >
           <el-form-item label="选择班级" prop="classid">
             <el-select
               v-model="queryParams.classid"
@@ -21,6 +18,8 @@
               ></el-option>
             </el-select>
           </el-form-item>
+        </el-col>
+        <el-col :xs="24" :ms="12" :md="5">
           <el-form-item label="选择教师" prop="jsid">
             <el-select
               v-model="queryParams.jsid"
@@ -36,18 +35,21 @@
               ></el-option>
             </el-select>
           </el-form-item>
+        </el-col>
+        <el-col :xs="24" :ms="12" :md="5">
           <el-form-item label="考核月份" prop="month">
             <el-date-picker
               clearable
               size="small"
-          style="width: 200px"
+              class="my-date-picker"
               v-model="queryParams.month"
               type="month"
               value-format="yyyy-MM"
               placeholder="选择月份"
             ></el-date-picker>
           </el-form-item>
-
+        </el-col>
+        <el-col :xs="24" :ms="12" :md="5">
           <el-form-item>
             <el-button
               type="primary"
@@ -60,6 +62,8 @@
               >重置</el-button
             >
           </el-form-item>
+        </el-col>
+      </el-row>
     </el-form>
 
     <el-row :gutter="10" class="mb8">
@@ -333,7 +337,7 @@ export default {
   },
   watch: {
     "queryParams.classid": function (val) {
-      console.log(val);
+      //console.log(val);
       if (val != "undefined") {
         getUserList(val).then((response) => {
           //console.log(response);
@@ -543,3 +547,20 @@ export default {
   margin: 0 !important;
 }
 </style>
+<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>