From 2cfd2a15d3eb1b7d2b42835db535e28e51a30632 Mon Sep 17 00:00:00 2001
From: song <srf428110@163.com>
Date: Fri, 10 Sep 2021 19:14:37 +0800
Subject: [PATCH] =?UTF-8?q?=E7=AD=9B=E9=80=89=E5=AE=A1=E6=A0=B8=E4=BA=BA?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .env                                         |  2 +-
 .env.development                             |  6 ++---
 .env.production                              |  6 ++---
 rest/project.http                            |  6 ++---
 src/components/MemberPicker/MemberPicker.vue | 23 +++++++++++++-------
 src/config/api-user.js                       |  2 +-
 src/config/api.js                            |  2 +-
 7 files changed, 27 insertions(+), 20 deletions(-)

diff --git a/.env b/.env
index a6f3a74..d6ce7d4 100644
--- a/.env
+++ b/.env
@@ -1,3 +1,3 @@
 VUE_APP_MODE=production
 VUE_APP_PREVIEW=false
-VUE_APP_URL=https://test.tall.wiki/checkwork
+VUE_APP_URL=https://www.tall.wiki/checkwork
diff --git a/.env.development b/.env.development
index 2c33c8a..9dd7ac0 100644
--- a/.env.development
+++ b/.env.development
@@ -1,10 +1,10 @@
 VUE_APP_MODE=development
 VUE_APP_NODE_ENV=development
 VUE_APP_SCENE=checkwork
-VUE_APP_BASE_URL=https://test.tall.wiki/checkwork/
-VUE_APP_API_URL=https://test.tall.wiki/checkwork/gateway
+VUE_APP_BASE_URL=https://www.tall.wiki/checkwork/
+VUE_APP_API_URL=https://www.tall.wiki/checkwork/gateway
 VUE_APP_PROXY_URL=/gateway
 VUE_APP_PUBLIC_PATH=/checkwork
-VUE_APP_MSG_URL=wss://test.tall.wiki/websocket/message/v4.0/ws
+VUE_APP_MSG_URL=wss://www.tall.wiki/websocket/message/v4.0/ws
 VUE_APP_TITLE=考勤管理
 VUE_APP_DESCRIPTION=考勤管理
diff --git a/.env.production b/.env.production
index b9b103f..fdb41e9 100644
--- a/.env.production
+++ b/.env.production
@@ -1,10 +1,10 @@
 VUE_APP_MODE=production
 VUE_APP_NODE_ENV=production
 VUE_APP_SCENE=checkwork
-VUE_APP_BASE_URL=https://test.tall.wiki/checkwork/
-VUE_APP_API_URL=https://test.tall.wiki/checkwork/gateway
+VUE_APP_BASE_URL=https://www.tall.wiki/checkwork/
+VUE_APP_API_URL=https://www.tall.wiki/checkwork/gateway
 VUE_APP_PROXY_URL=/gateway
 VUE_APP_PUBLIC_PATH=/checkwork
-VUE_APP_MSG_URL=wss://test.tall.wiki/websocket/message/v4.0/ws
+VUE_APP_MSG_URL=wss://www.tall.wiki/websocket/message/v4.0/ws
 VUE_APP_TITLE=考勤管理
 VUE_APP_DESCRIPTION=考勤管理
diff --git a/rest/project.http b/rest/project.http
index 48179b8..cbddcbd 100644
--- a/rest/project.http
+++ b/rest/project.http
@@ -1,7 +1,7 @@
 
 ### login
 # @name login
-POST https://test.tall.wiki/gateway/tall/v1.0/users/signin
+POST https://www.tall.wiki/gateway/tall/v1.0/users/signin
 content-type: application/json;charset=utf-8
 
 {
@@ -18,7 +18,7 @@ content-type: application/json;charset=utf-8
 
 ### 导入插件
 # POST http://127.0.0.1:7220/plugin/import
-POST http://test.tall.wiki/gateway/pluginshop/plugin/import
+POST http://www.tall.wiki/gateway/pluginshop/plugin/import
 Content-Type: multipart/form-data; boundary=----WebKitFormBoundary7MA4YWxkTrZu0gW
 Authorization: Bearer {{login.response.body.$.data.token}}
 
@@ -34,6 +34,6 @@ Content-Type: xlsx
 
 
 ### 更新redis内的插件信息
-POST http://test.tall.wiki/gateway/pluginshop/plugin/updatePluginOfRedis
+POST http://www.tall.wiki/gateway/pluginshop/plugin/updatePluginOfRedis
 content-type: application/json;charset=utf-8
 Authorization: Bearer {{login.response.body.$.data.token}}
diff --git a/src/components/MemberPicker/MemberPicker.vue b/src/components/MemberPicker/MemberPicker.vue
index c0100c8..4e015ea 100644
--- a/src/components/MemberPicker/MemberPicker.vue
+++ b/src/components/MemberPicker/MemberPicker.vue
@@ -1,13 +1,7 @@
 <template>
   <div class="mt-3">
     <!-- 多选 -->
-    <a-select
-      mode="multiple"
-      style="width: 100%"
-      placeholder="请选择成员"
-      @change="handleChange"
-      :value="memberIdList && memberIdList.length ? memberIdList : '全部'"
-    >
+    <a-select mode="multiple" style="width: 100%" placeholder="请选择成员" @change="handleChange" :value="defaultMemberIds">
       <a-select-option value=""> 全部 </a-select-option>
       <a-select-option :value="member.memberId" v-for="member in members" :key="member.memberId"> {{ member.name }} </a-select-option>
     </a-select>
@@ -19,25 +13,38 @@ import { mapState, mapMutations } from 'vuex';
 
 export default {
   data() {
-    return {};
+    return { defaultMemberIds: ['全部'] };
   },
 
   computed: mapState('home', ['members', 'memberIdList']),
 
+  watch: {
+    memberIdList(val) {
+      if (val) {
+        this.defaultMemberIds = [...val];
+      } else {
+        this.defaultMemberIds = ['全部'];
+      }
+    },
+  },
+
   methods: {
     ...mapMutations('home', ['setMemberIdList']),
 
     handleChange(value) {
       if (value[value.length - 1] === '') {
         this.setMemberIdList();
+        this.defaultMemberIds = ['全部'];
       } else if (value) {
         const index = value.findIndex(item => item === '全部');
         if (index !== -1) {
           value.splice(index, 1);
         }
         this.setMemberIdList(value);
+        this.defaultMemberIds = value;
       } else {
         this.setMemberIdList();
+        this.defaultMemberIds = ['全部'];
       }
     },
   },
diff --git a/src/config/api-user.js b/src/config/api-user.js
index ddb4f1c..9b46e51 100644
--- a/src/config/api-user.js
+++ b/src/config/api-user.js
@@ -1,7 +1,7 @@
 import axios from 'axios';
 let { proxyUrl } = require('@/config/setting');
 
-const tall = `https://test.tall.wiki/gateway/tall3/v3.0`;
+const tall = `https://www.tall.wiki/gateway/tall3/v3.0`;
 const users = `${tall}/users`;
 
 // 通过userId获取token
diff --git a/src/config/api.js b/src/config/api.js
index fa727ca..a874933 100644
--- a/src/config/api.js
+++ b/src/config/api.js
@@ -1,6 +1,6 @@
 import axios from 'axios';
 
-const defaultwbs = `https://test.tall.wiki/gateway/defaultwbs`;
+const defaultwbs = `https://www.tall.wiki/gateway/defaultwbs`;
 
 // 查询考勤信息
 export const clockQuery = params => axios.post(`${defaultwbs}/clock/query`, params);