Browse Source

筛选审核人修改

master
song 4 years ago
parent
commit
2cfd2a15d3
  1. 2
      .env
  2. 6
      .env.development
  3. 6
      .env.production
  4. 6
      rest/project.http
  5. 23
      src/components/MemberPicker/MemberPicker.vue
  6. 2
      src/config/api-user.js
  7. 2
      src/config/api.js

2
.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

6
.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=考勤管理

6
.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=考勤管理

6
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}}

23
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 = ['全部'];
}
},
},

2
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

2
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);

Loading…
Cancel
Save