From 5eabfed1535f5d1657b3920bad348c805fbe3d66 Mon Sep 17 00:00:00 2001
From: gzw <1571020389@qq.com>
Date: Tue, 6 Jun 2023 23:31:00 +0800
Subject: [PATCH] Optimize query blanks

---
 ui/src/pages/attendance/AttendanceHome.vue | 78 ++++++++++++----------
 ui/src/pages/attendance/UserAttendance.vue | 63 ++++++++++-------
 2 files changed, 81 insertions(+), 60 deletions(-)

diff --git a/ui/src/pages/attendance/AttendanceHome.vue b/ui/src/pages/attendance/AttendanceHome.vue
index a072187..a951a0e 100644
--- a/ui/src/pages/attendance/AttendanceHome.vue
+++ b/ui/src/pages/attendance/AttendanceHome.vue
@@ -51,6 +51,8 @@
     </el-row>
 
     <el-table
+        v-loading="dataLoading"
+        element-loading-text="加载中..."
         :data="tableData"
         border
         :header-cell-style="{ background: 'aliceblue' }"
@@ -153,7 +155,7 @@
     </el-dialog>
 </template>
 <script lang="ts">
-import { SIZE_ICON_SM, SIZE_ICON_XL } from '@/constants/Common.constants.js'
+import { DATABASE_SELECT_OK, SIZE_ICON_SM, SIZE_ICON_XL } from '@/constants/Common.constants.js'
 import { ElMessage } from 'element-plus'
 import 'element-plus/theme-chalk/el-message.css'
 
@@ -185,7 +187,7 @@ export default {
                 attTime: ''
             },
             isDisabled: false,
-
+            dataLoading: true,
             options: [
                 {
                     value: 1,
@@ -226,43 +228,53 @@ export default {
                 .then((response) => {
                     this.users = response.data.data
                 })
-                .catch((reportError) => {
-                    console.log(reportError)
-                })
+                .catch((reportError) => {})
         },
         // 获取所有考勤信息
         getAttendances() {
+            this.dataLoading = true
             request
                 .get('/attendance/findAllAttendance')
                 .then((response) => {
-                    this.tableData = response.data.data
+                    if (response.data.code === DATABASE_SELECT_OK) {
+                        this.dataLoading = false
+                        this.tableData = response.data.data
+                    }
                 })
                 .catch((reportError) => {
-                    console.log(reportError)
+                    this.dataLoading = false
                 })
         },
         getAttendancesByTime() {
-            const start = this.handleDateFormatUTC(this.attTime[0])
-            const end = this.handleDateFormatUTC(this.attTime[1])
-            request
-                .get('/attendance/findAttendanceByTime', {
-                    startTime: start,
-                    endTime: end
-                })
-                .then((response) => {
-                    this.tableData = response.data.data
-                    ElMessage({
-                        message: '查询成功',
-                        type: 'success'
+            this.dataLoading = true
+            if (this.attTime.length !== 0) {
+                const start = this.handleDateFormatUTC(this.attTime[0])
+                const end = this.handleDateFormatUTC(this.attTime[1])
+                request
+                    .get('/attendance/findAttendanceByTime', {
+                        startTime: start,
+                        endTime: end
                     })
-                })
-                .catch((reportError) => {
-                    console.log(reportError)
-                    ElMessage({
-                        message: '查询失败',
-                        type: 'error'
+                    .then((response) => {
+                        if (response.data.code === DATABASE_SELECT_OK) {
+                            this.dataLoading = false
+                            this.tableData = response.data.data
+                            ElMessage({
+                                message: '查询成功',
+                                type: 'success'
+                            })
+                        }
                     })
-                })
+                    .catch((reportError) => {
+                        this.dataLoading = false
+                        ElMessage({
+                            message: '查询失败',
+                            type: 'error'
+                        })
+                    })
+            } else {
+                this.getAttendances()
+            }
         },
         handleDateFormatUTC(date) {
             let newFormat = ''
@@ -303,12 +315,9 @@ export default {
             request
                 .post('/attendance/saveAttendance', formData)
                 .then((response) => {
-                    console.log(response)
                     this.getAttendances()
                 })
-                .catch((reportError) => {
-                    console.log(reportError)
-                })
+                .catch((reportError) => {})
         },
         // 获取更改数据
         viewUpdate(row) {
@@ -344,7 +353,6 @@ export default {
                 .delete('/attendance/delAttendance/' + id)
                 .then((response) => {
                     if (response) {
-                        console.log(response)
                         ElMessage({
                             message: '删除成功',
                             type: 'success'
@@ -357,9 +365,7 @@ export default {
                         })
                     }
                 })
-                .catch((reportError) => {
-                    console.log(reportError)
-                })
+                .catch((reportError) => {})
         },
         // 批量删除
         handleSelectionChange(val) {
@@ -384,9 +390,7 @@ export default {
                         })
                     }
                 })
-                .catch((reportError) => {
-                    console.log(reportError)
-                })
+                .catch((reportError) => {})
         }
     },
     created() {
diff --git a/ui/src/pages/attendance/UserAttendance.vue b/ui/src/pages/attendance/UserAttendance.vue
index 88e7e87..f783ac2 100644
--- a/ui/src/pages/attendance/UserAttendance.vue
+++ b/ui/src/pages/attendance/UserAttendance.vue
@@ -34,6 +34,8 @@
     </el-row>
 
     <el-table
+        v-loading="dataLoading"
+        element-loading-text="加载中..."
         :data="tableData"
         border
         :header-cell-style="{ background: 'aliceblue' }"
@@ -94,7 +96,7 @@
 </template>
 
 <script lang="ts">
-import { SIZE_ICON_SM, SIZE_ICON_XL } from '@/constants/Common.constants.js'
+import { DATABASE_SELECT_OK, SIZE_ICON_SM, SIZE_ICON_XL } from '@/constants/Common.constants.js'
 import { ElMessage } from 'element-plus'
 import 'element-plus/theme-chalk/el-message.css'
 import _ from 'lodash'
@@ -108,7 +110,7 @@ export default {
             id: '',
             userId: '',
             username: '',
-            attTime: '',
+            attTime: [],
             attTimeB: [],
             status: '',
             pageNum: 1,
@@ -116,6 +118,7 @@ export default {
             total: 0,
             nowTime: new Date(),
             formLabelWidth: '80px',
+            dataLoading: true,
             value1: '',
             form: {
                 userId: '',
@@ -162,35 +165,49 @@ export default {
         },
 
         getOneAttendancesByTime() {
-            const start = this.handleDateFormatUTC(this.attTimeB[0])
-            const end = this.handleDateFormatUTC(this.attTimeB[1])
-            request
-                .get('/attendance/findOneAttendanceByTime', {
-                    startTime: start,
-                    endTime: end
-                })
-                .then((response) => {
-                    this.tableData = response.data.data
-                    ElMessage({
-                        message: '查询成功',
-                        type: 'success'
+            this.dataLoading = true
+            if (this.attTimeB.length !== 0) {
+                const start = this.handleDateFormatUTC(this.attTimeB[0])
+                const end = this.handleDateFormatUTC(this.attTimeB[1])
+                request
+                    .get('/attendance/findOneAttendanceByTime', {
+                        startTime: start,
+                        endTime: end
                     })
-                })
-                .catch((reportError) => {
-                    ElMessage({
-                        message: '查询失败',
-                        type: 'error'
+                    .then((response) => {
+                        if (response.data.code === DATABASE_SELECT_OK) {
+                            this.dataLoading = false
+                            this.tableData = response.data.data
+                            ElMessage({
+                                message: '查询成功',
+                                type: 'success'
+                            })
+                        }
                     })
-                    this.getAttendancesByUserId()
-                })
+                    .catch((reportError) => {
+                        this.dataLoading = false
+                        ElMessage({
+                            message: '查询失败',
+                            type: 'error'
+                        })
+                    })
+            } else {
+                this.getAttendancesByUserId()
+            }
         },
         getAttendancesByUserId() {
+            this.dataLoading = true
             request
                 .get('/attendance/selectAttendance')
                 .then((response) => {
-                    this.tableData = response.data.data
+                    if (response.data.code === DATABASE_SELECT_OK) {
+                        this.dataLoading = false
+                        this.tableData = response.data.data
+                    }
+                })
+                .catch((reportError) => {
+                    this.dataLoading = false
                 })
-                .catch((reportError) => {})
         },
         resetForm() {
             this.$refs.form.resetFields()