From 7eb5b93102d6d5fb0ad69ada5b64bf51730cb1a6 Mon Sep 17 00:00:00 2001
From: song <srf428110@163.com>
Date: Mon, 6 Sep 2021 16:49:51 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AF=BC=E5=87=BA=E8=80=83=E5=8B=A4,=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9=E4=BC=A0=E5=8F=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .env.production                              |  2 +-
 src/components/HeadNav/HeadNav.vue           | 36 +++++++++++++++---
 src/components/List/List.vue                 | 29 ++++++++------
 src/components/MemberPicker/MemberPicker.vue |  8 ++--
 src/components/TimePicker/TimePicker.vue     | 40 +++++++++++++++-----
 src/config/api.js                            |  3 ++
 src/store/modules/home/mutations.js          | 27 +++++++++++++
 src/store/modules/home/state.js              |  3 ++
 src/views/FirstPage/FirstPage.vue            |  4 +-
 9 files changed, 120 insertions(+), 32 deletions(-)

diff --git a/.env.production b/.env.production
index 09f58c5..b9b103f 100644
--- a/.env.production
+++ b/.env.production
@@ -5,6 +5,6 @@ VUE_APP_BASE_URL=https://test.tall.wiki/checkwork/
 VUE_APP_API_URL=https://test.tall.wiki/checkwork/gateway
 VUE_APP_PROXY_URL=/gateway
 VUE_APP_PUBLIC_PATH=/checkwork
-VUE_APP_MSG_URL=wss://www.tall.wiki/websocket/message/v4.0/ws
+VUE_APP_MSG_URL=wss://test.tall.wiki/websocket/message/v4.0/ws
 VUE_APP_TITLE=考勤管理
 VUE_APP_DESCRIPTION=考勤管理
diff --git a/src/components/HeadNav/HeadNav.vue b/src/components/HeadNav/HeadNav.vue
index fbe53fb..875710e 100644
--- a/src/components/HeadNav/HeadNav.vue
+++ b/src/components/HeadNav/HeadNav.vue
@@ -2,21 +2,47 @@
   <div class="d-flex justify-space-between align-center justify-center nav mb-4">
     <!-- <a-icon type="left" class="back" /> -->
     <div>考勤管理</div>
-    <a-button type="primary" size="small" class="export"> 导出 </a-button>
+    <a-button type="primary" size="small" class="export" @click="clockExport"> 导出 </a-button>
   </div>
 </template>
 
 <script>
+import { mapState } from 'vuex';
+import { clockExport } from '@/config/api';
+
 export default {
   data() {
     return {};
   },
 
-  created() {},
-
-  mounted() {},
+  computed: mapState('home', ['projectId', 'startTime', 'endTime', 'memberIdList']),
 
-  methods: {},
+  methods: {
+    /**
+     * 导出考勤excel
+     * @param {string} projectId
+     * @param {array} memberIdList
+     * @param {string} startTime
+     * @param {string} endTime
+     */
+    async clockExport() {
+      try {
+        const { projectId, memberIdList, startTime, endTime } = this;
+        const params = { param: { projectId, memberIdList, startTime, endTime } };
+        const res = await clockExport(params);
+        const { code, msg, data } = res.data;
+        if (code === 200) {
+          this.$message.success('导出成功');
+          window.location.href = data.url;
+        } else {
+          this.$message.error(msg || '导出失败');
+          throw msg;
+        }
+      } catch (error) {
+        throw error || '导出失败';
+      }
+    },
+  },
 };
 </script>
 
diff --git a/src/components/List/List.vue b/src/components/List/List.vue
index b0cc3d6..e48e248 100644
--- a/src/components/List/List.vue
+++ b/src/components/List/List.vue
@@ -149,7 +149,7 @@
 </template>
 
 <script>
-import { mapState } from 'vuex';
+import { mapState, mapMutations } from 'vuex';
 import { clockQuery, clockPunch, clockAudit } from '@/config/api';
 
 const columns = [
@@ -171,7 +171,6 @@ export default {
     return {
       columns,
       clockInfos: [],
-      memberIdList: [],
       options: null,
       checkerId: undefined,
       morningVisible: false,
@@ -184,12 +183,10 @@ export default {
       auditOptions: null,
       morningLoading: false,
       nightLoading: false,
-      startTime: '',
-      endTime: '',
     };
   },
 
-  computed: mapState('home', ['projectId', 'members']),
+  computed: mapState('home', ['projectId', 'members', 'startTime', 'endTime', 'memberIdList']),
 
   mounted() {
     this.timer = setInterval(async () => {
@@ -204,16 +201,24 @@ export default {
         });
       }
     }, 300);
+
+    const time = this.$moment(Date.now()).format('YYYY-MM-DD');
+    if (!this.startTime) {
+      this.setStartTime(this.$moment(`${time} 00:00`).format('x') - 0);
+    }
+    if (!this.endTime) {
+      this.setEndTime(this.$moment(`${time} 23:59`).format('x') - 0);
+    }
   },
 
   methods: {
-    async setParams(options) {
-      const { projectId } = this;
-      const time = this.$moment(Date.now()).format('YYYY-MM-DD');
-      this.startTime = (options && options.startTime) || this.$moment(`${time} 00:00`).format('x') - 0;
-      this.endTime = (options && options.endTime) || this.$moment(`${time} 23:59`).format('x') - 0;
-      this.memberIdList = (options && options.memberIdList) || [];
-      const params = { param: { projectId, memberIdList: this.memberIdList, startTime: this.startTime, endTime: this.endTime } };
+    ...mapMutations('home', ['setStartTime', 'setEndTime', 'setMemberIdList']),
+
+    async setParams() {
+      const { projectId, startTime, endTime, memberIdList } = this;
+      console.log('this.startTime: ', startTime, this.$moment(startTime - 0).format('YYYY-MM-DD HH:mm:ss'));
+      console.log('this.endTime: ', endTime, this.$moment(endTime - 0).format('YYYY-MM-DD HH:mm:ss'));
+      const params = { param: { projectId, memberIdList, startTime, endTime } };
       await this.getClockQuery(params);
     },
 
diff --git a/src/components/MemberPicker/MemberPicker.vue b/src/components/MemberPicker/MemberPicker.vue
index a3d5398..5b8a3c9 100644
--- a/src/components/MemberPicker/MemberPicker.vue
+++ b/src/components/MemberPicker/MemberPicker.vue
@@ -8,7 +8,7 @@
 </template>
 
 <script>
-import { mapState } from 'vuex';
+import { mapState, mapMutations } from 'vuex';
 
 export default {
   data() {
@@ -18,10 +18,12 @@ export default {
   computed: mapState('home', ['members']),
 
   methods: {
+    ...mapMutations('home', ['setMemberIdList']),
+
     handleChange(value) {
+      this.setMemberIdList(value);
       setTimeout(() => {
-        const options = { memberIdList: value };
-        this.$emit('changeTime', options);
+        this.$emit('changeTime');
       }, 1000);
     },
   },
diff --git a/src/components/TimePicker/TimePicker.vue b/src/components/TimePicker/TimePicker.vue
index dc94d01..dde6bd5 100644
--- a/src/components/TimePicker/TimePicker.vue
+++ b/src/components/TimePicker/TimePicker.vue
@@ -37,6 +37,8 @@
 </template>
 
 <script>
+import { mapMutations } from 'vuex';
+
 export default {
   data() {
     return {
@@ -48,20 +50,39 @@ export default {
     };
   },
   watch: {
-    endValue(val) {
-      if (!this.startValue) {
-        this.$message.error('请选择起始时间');
-        return;
+    startValue(val) {
+      if (val) {
+        const startTime = this.$moment(val).format('x');
+        this.setStartTime(startTime);
+      } else {
+        const time = this.$moment(Date.now()).format('YYYY-MM-DD');
+        this.setStartTime(this.$moment(`${time} 00:00`).format('x') - 0);
+        if (!this.endValue) {
+          this.$emit('changeTime');
+        }
       }
-      if (this.startValue && val) {
-        const startTime = this.$moment(this.startValue).format('x');
-        const endTime = this.$moment(this.endValue).format('x');
-        const options = { startTime, endTime };
-        this.$emit('changeTime', options);
+    },
+    endValue(val) {
+      if (val) {
+        const endTime = this.$moment(val).format('x');
+        this.setEndTime(endTime);
+
+        if (val && !this.startValue) {
+          this.$message.error('请选择起始时间');
+          return;
+        }
+      } else {
+        const time = this.$moment(Date.now()).format('YYYY-MM-DD');
+        this.setEndTime(this.$moment(`${time} 23:59`).format('x') - 0);
       }
+
+      this.$emit('changeTime');
     },
   },
+
   methods: {
+    ...mapMutations('home', ['setStartTime', 'setEndTime']),
+
     // 昨天
     setYesterday(value, open) {
       this[value] = this.$moment(new Date().getTime() - 24 * 60 * 60 * 1000).format('YYYY-MM-DD');
@@ -71,6 +92,7 @@ export default {
       }
     },
 
+    // 今天
     setToday(value, open) {
       this[value] = this.$moment(new Date()).format('YYYY-MM-DD');
       this[open] = false;
diff --git a/src/config/api.js b/src/config/api.js
index 91841df..fa727ca 100644
--- a/src/config/api.js
+++ b/src/config/api.js
@@ -13,3 +13,6 @@ export const queryChecker = params => axios.post(`${defaultwbs}/deliver/queryChe
 
 // 查询所有成员
 export const clockAudit = params => axios.post(`${defaultwbs}/clock/audit`, params);
+
+// 导出考勤excel
+export const clockExport = params => axios.post(`${defaultwbs}/clock/export`, params);
diff --git a/src/store/modules/home/mutations.js b/src/store/modules/home/mutations.js
index e525dc5..7d63579 100644
--- a/src/store/modules/home/mutations.js
+++ b/src/store/modules/home/mutations.js
@@ -25,6 +25,33 @@ const mutations = {
   setMembers(state, data) {
     state.members = data;
   },
+
+  /**
+   * 设置开始时间
+   * @param {object} state
+   * @param {string} data
+   */
+  setStartTime(state, data) {
+    state.startTime = data;
+  },
+
+  /**
+   * 设置结束时间
+   * @param {object} state
+   * @param {string} data
+   */
+  setEndTime(state, data) {
+    state.endTime = data;
+  },
+
+  /**
+   * 设置所选成员信息
+   * @param {object} state
+   * @param {Array} data
+   */
+  setMemberIdList(state, data) {
+    state.memberIdList = data;
+  },
 };
 
 export default mutations;
diff --git a/src/store/modules/home/state.js b/src/store/modules/home/state.js
index 98d54bb..0316996 100644
--- a/src/store/modules/home/state.js
+++ b/src/store/modules/home/state.js
@@ -9,6 +9,9 @@ const state = {
   projectId: '',
   clockInfos: [], // 考勤信息
   members: [], // 所有成员
+  startTime: '',
+  endTime: '',
+  memberIdList: [],
 };
 
 export default state;
diff --git a/src/views/FirstPage/FirstPage.vue b/src/views/FirstPage/FirstPage.vue
index e993aca..9df60db 100644
--- a/src/views/FirstPage/FirstPage.vue
+++ b/src/views/FirstPage/FirstPage.vue
@@ -25,8 +25,8 @@ export default {
       console.log(`selected ${value}`);
     },
 
-    changeTime(options) {
-      this.$refs.mychild.setParams(options);
+    changeTime() {
+      this.$refs.mychild.setParams();
     },
   },
 };