From 6b3289b23955690abbf3bb4b7f530b34c74f697b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9B=B9=E8=BE=89?= <814457906@qq.com>
Date: Mon, 17 Apr 2023 10:34:49 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/system/AppletAccessLog.js          |  4 ++--
 src/views/assembly/classe.vue              | 21 ++++++++++++++-------
 src/views/system/AppletAccessLog/index.vue | 22 ++++++++++++----------
 3 files changed, 28 insertions(+), 19 deletions(-)

diff --git a/src/api/system/AppletAccessLog.js b/src/api/system/AppletAccessLog.js
index ab5b367..97591f2 100644
--- a/src/api/system/AppletAccessLog.js
+++ b/src/api/system/AppletAccessLog.js
@@ -1,9 +1,9 @@
 import request from '@/utils/request'
 
 // 查询
-export function appletVisitRecord(pageNum, pageSize, parentInfoId, kindergartenId, startDate, endDate, loginType) {
+export function appletVisitRecord(pageNum, pageSize, parentInfoId, classId, startDate, endDate, loginType) {
     return request({
-        url: `/system/appLogManage/appletVisitRecord?pageNum=${pageNum}&pageSize=${pageSize}&parentInfoId=${parentInfoId}&kindergartenId=${kindergartenId}&startDate=${startDate}&endDate=${endDate}&loginType=${loginType}`,
+        url: `/system/appLogManage/appletVisitRecord?pageNum=${pageNum}&pageSize=${pageSize}&parentInfoId=${parentInfoId}&classId=${classId}&startDate=${startDate}&endDate=${endDate}&loginType=${loginType}`,
         method: 'post',
     })
 }
\ No newline at end of file
diff --git a/src/views/assembly/classe.vue b/src/views/assembly/classe.vue
index 1759125..fe9939c 100644
--- a/src/views/assembly/classe.vue
+++ b/src/views/assembly/classe.vue
@@ -1,6 +1,6 @@
 <template>
   <div class="app-container">
-    <el-form ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="90px">
+    <el-form ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="70px">
       <el-form-item label="所属班级" prop="className">
         <el-button
           @click="classshow = true"
@@ -65,9 +65,16 @@
             ></el-button>
           </template>
         </el-table-column>
-        <el-table-column property="kindergartenName" label="所属幼儿园" align="center"></el-table-column>
+        <el-table-column property="kindergartenName" label="幼儿园名称" align="center"></el-table-column>
         <el-table-column property="className" label="班级名称" align="center"></el-table-column>
-        <el-table-column property="classType" label="班级类型" align="center"></el-table-column>
+        <el-table-column property="classType" label="班级类型" align="center">
+          <template slot-scope="scope">
+            {{ scope.row.classType == 'LARGE_CLASS' ? "大班" : "" }}
+            {{ scope.row.classType == 'MIDDLE_CLASS' ? "中班" : "" }}
+            {{ scope.row.classType == 'SMALL_CLASS' ? "小班" : "" }}
+            {{ scope.row.classType == 'GRADUATE' ? "毕业" : "" }}
+          </template>
+        </el-table-column>
         <el-table-column property="classTeacher" label="班主任姓名" align="center"></el-table-column>
         <el-table-column property="phone" label="联系电话" align="center"></el-table-column>
       </el-table>
@@ -119,11 +126,11 @@ export default {
   },
   methods: {
     onshow() {
-      this.classId = localStorage.getItem("classId");
+      // this.classId = localStorage.getItem("classId");
       if (localStorage.getItem("className") == null) {
         this.className = "请选择班级";
       } else {
-        this.className = localStorage.getItem("className");
+        // this.className = localStorage.getItem("className");
       }
       this.$emit("classelist", this.classId);
     },
@@ -165,8 +172,8 @@ export default {
     },
     // 表单重置
     reset() {
-      this.form = {};
-      this.resetForm("form");
+      this.className = "请选择班级";
+      this.classId = "";
     }
   }
 };
diff --git a/src/views/system/AppletAccessLog/index.vue b/src/views/system/AppletAccessLog/index.vue
index f3eacb7..e7ffbf6 100644
--- a/src/views/system/AppletAccessLog/index.vue
+++ b/src/views/system/AppletAccessLog/index.vue
@@ -1,6 +1,7 @@
 <template>
   <div class="app-container">
-    <kindergar @kinbatlist="kinbatlist" style="width: 500px; display: inline;" ref="kinresets"></kindergar>
+    <!-- <kindergar @kinbatlist="kinbatlist" style="width: 500px; display: inline;" ref="kinresets"></kindergar> -->
+    <classe @classelist="classelist" style="width: 500px; display: inline;" ref="classe"></classe>
     <parent @parentlist="parentlist" style="width: 500px; display: inline;" ref="resets"></parent>
     <el-form size="small" :inline="true" v-show="showSearch">
       <el-form-item label="日期" prop="orderStatus" label-width="60px">
@@ -17,7 +18,7 @@
         ></el-date-picker>
       </el-form-item>
       <el-form-item label="操作类型" prop="patientName" label-width="80px">
-        <el-select v-model="loginType" placeholder="请选择订单状态">
+        <el-select v-model="loginType" placeholder="请选择订单状态" clearable>
           <el-option
             v-for="item in loginTypelist"
             :key="item.value"
@@ -53,11 +54,11 @@
 </template>
 <script>
 import { appletVisitRecord } from "@/api/system/AppletAccessLog";
-import kindergar from "../../assembly/kindergarlog.vue";
+import classe from "../../assembly/classe.vue";
 import parent from "../../assembly/parent.vue";
 export default {
   name: "AppletAccessLog",
-  components: { kindergar, parent },
+  components: { classe, parent },
   data() {
     return {
       pickerOptions: {
@@ -111,7 +112,7 @@ export default {
       pageNum: 1,
       pageSize: 10,
       parentInfoId: "",
-      kindergartenId: "",
+      classId: "",
       startDate: null,
       endDate: null,
       loginType: "",
@@ -155,7 +156,7 @@ export default {
         this.pageNum,
         this.pageSize,
         this.parentInfoId,
-        this.kindergartenId,
+        this.classId,
         this.startDate,
         this.endDate,
         this.loginType
@@ -168,11 +169,12 @@ export default {
     resetQuery() {
       this.newtime();
       this.parentInfoId = "";
-      this.kindergartenId = "";
+      this.classId = "";
       this.loginType = "";
       this.valuetime = "";
       this.$refs.resets.reset();
       this.$refs.kinresets.reset();
+      this.$refs.classe.reset();
       this.getlist();
     },
     //选择时期区间
@@ -184,9 +186,9 @@ export default {
     parentlist(e) {
       this.parentInfoId = e;
     },
-    //所属幼儿园
-    kinbatlist(kindergartenId) {
-      this.kindergartenId = kindergartenId;
+    //班级
+    classelist(e) {
+      this.classId = e;
     },
     formatDate(time, timetype) {
       let date = new Date(time); //13位时间戳