Skip to content

Commit 62821dc

Browse files
lianluoyilianluoyi
authored
Merge pull request #31 from lianluoyi/dev
V1.34.0版本更新
2 parents 77ee5c4 + bfa3036 commit 62821dc

File tree

47 files changed

+1657
-1149
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

47 files changed

+1657
-1149
lines changed

‎nginx.conf

Lines changed: 34 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -1,34 +1,34 @@
1-
gzip on;
2-
gzip_min_length 100k;
3-
gzip_buffers 4 16k;
4-
gzip_http_version 1.1;
5-
gzip_comp_level 6; #压缩等级，号量不多并发小的客户可以使用6，号量多并发高的客户使用1
6-
gzip_types text/plain application/x-javascript text/css application/xml text/javascript application/x-httpd-php application/javascript;
7-
gzip_disable "MSIE [1-6]\.";
8-
9-
upstream api{
10-
server 172.16.0.2:32093 weight=1 fail_timeout=2s max_fails=2;
11-
}
12-
13-
server {
14-
listen 80;
15-
server_name 127.0.0.1;
16-
client_max_body_size 50m;
17-
location / {
18-
root /app/dist;
19-
index index.html index.htm;
20-
}
21-
location /api/ {
22-
proxy_pass http://api/;
23-
proxy_http_version 1.1;
24-
index index.html index.htm;
25-
}
26-
location /profile {
27-
proxy_pass http://api;
28-
proxy_http_version 1.1;
29-
proxy_connect_timeout 1;
30-
proxy_send_timeout 30;
31-
proxy_read_timeout 60;
32-
proxy_buffering off;
33-
}
34-
}
1+
gzip on;
2+
gzip_min_length 100k;
3+
gzip_buffers 4 16k;
4+
gzip_http_version 1.0;
5+
gzip_comp_level 6; #压缩等级，号量不多并发小的客户可以使用6，号量多并发高的客户使用1
6+
gzip_types text/plain application/x-javascript text/css application/xml text/javascript application/x-httpd-php application/javascript;
7+
gzip_disable "MSIE [1-6]\.";
8+
9+
upstream api{
10+
server 172.16.0.2:32093 weight=1 fail_timeout=2s max_fails=2;
11+
}
12+
13+
server {
14+
listen 80;
15+
server_name 127.0.0.1;
16+
client_max_body_size 50m;
17+
location / {
18+
root /app/dist;
19+
index index.html index.htm;
20+
}
21+
location /api/ {
22+
proxy_pass http://api/;
23+
proxy_http_version 1.1;
24+
index index.html index.htm;
25+
}
26+
location /profile {
27+
proxy_pass http://api;
28+
proxy_http_version 1.1;
29+
proxy_connect_timeout 1;
30+
proxy_send_timeout 30;
31+
proxy_read_timeout 60;
32+
proxy_buffering off;
33+
}
34+
}

‎src/api/customer/index.js

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -158,6 +158,19 @@ export function listDistinct(params) {
158158
});
159159
}
160160

161+
/**
162+
* 会话存档客户检索获取客户列表总数
163+
* @param {*} params
164+
* @returns
165+
*/
166+
export function listDistinctCount(params) {
167+
return request({
168+
url: service + '/listDistinct/count',
169+
method: 'get',
170+
params
171+
});
172+
}
173+
161174
// 导出客户结果
162175
export function exportCustomerResult(params) {
163176
return request({

‎src/components/CommonTree/index.vue

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<!--
22
* @Description: 公共树组件（统一判断空值情况）
33
* @Author: broccoli
4-
* @LastEditors: broccoli
4+
* @LastEditors: wJiaaa
55
* @remrk 空值调用时slot命名为empty
66
-->
77

@@ -110,6 +110,7 @@ export default {
110110
:default-expanded-keys="defaultExpandedKeys"
111111
:filter-node-method="filterNode"
112112
v-bind="$attrs"
113+
empty-text=""
113114
v-on="$listeners"
114115
@node-click="nodeClick"
115116
>

‎src/components/EmptyDefaultIcon.vue

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<!--
22
* @Description: 空值缺省图
33
* @Author: broccoli
4-
* @LastEditors: xulinbin
4+
* @LastEditors: wJiaaa
55
-->
66

77
<script>
@@ -166,10 +166,8 @@ export default {
166166
<slot name="customBtn" />
167167
</div>
168168
</div>
169-
<div v-show="length !== 0">
170-
<!-- @slot 传入的length不为0时展示传入的slot节点 -->
171-
<slot />
172-
</div>
169+
<!-- @slot 传入的length不为0时展示传入的slot节点 -->
170+
<slot v-show="length !== 0" />
173171
</div>
174172
</template>
175173

‎src/components/Pagination/NumPagination.vue

Lines changed: 38 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<template>
77
<el-pagination
88
v-bind="$attrs"
9-
layout="sizes,slot"
9+
:layout="layout"
1010
:page-sizes="pageSizes"
1111
:page-size.sync="pageSize"
1212
:total="total"
@@ -15,6 +15,7 @@
1515
<span class="el-pagination__jump ml5">
1616
<i :class="[ currentPage > 1 ? 'pointer' : 'not-allowed', 'mr10 el-icon-arrow-left']" @click="previousPage" />
1717
<el-input
18+
v-if="!disabledInput"
1819
:value="currentPage !== null ? currentPage : 1"
1920
class="el-pagination__editor is-in-pagination"
2021
type="number"
@@ -23,9 +24,10 @@
2324
@input="handleInput"
2425
@change="handleChange"
2526
/>
27+
<div v-else class="current-page">{{ currentPage }}</div>
2628
<span class="no-select">
27-
<span class="ml20">/</span>
28-
<span>
29+
<span class="division">/</span>
30+
<span class="page-count">
2931
{{ pageCount }}
3032
</span>
3133
</span>
@@ -37,6 +39,7 @@
3739
<script>
3840
import { PAGE_LIMIT, PAGE_LIMIT_TWENTY, PAGE_LIMIT_THIRTY, PAGE_LIMIT_FIFTY, DEFAULT_PAGE_NUM } from '@/utils/constant/index';
3941
export default {
42+
name: 'NumPagination',
4043
props: {
4144
total: {
4245
required: true,
@@ -55,6 +58,18 @@ export default {
5558
default() {
5659
return [PAGE_LIMIT, PAGE_LIMIT_TWENTY, PAGE_LIMIT_THIRTY, PAGE_LIMIT_FIFTY];
5760
}
61+
},
62+
/**
63+
* 分页布局
64+
*/
65+
layout: {
66+
type: String,
67+
default: 'sizes,slot'
68+
},
69+
/** 是否禁用输入框 */
70+
disabledInput: {
71+
type: Boolean,
72+
default: false
5873
}
5974
},
6075
computed: {
@@ -145,17 +160,34 @@ export default {
145160
}
146161
.not-allowed {
147162
cursor: not-allowed;
163+
color: #ccc;
164+
}
165+
.current-page {
166+
font-weight: 100;
167+
font-size: 15px;
168+
display: inline;
169+
margin-right: 5px;
170+
margin-left: 5px;
148171
}
149172
.no-select {
150173
user-select:none;
151-
margin-top: 1px;
174+
text-align: center;
152175
span {
153176
font-weight: 100;
154177
font-size: 15px;
155-
margin-right: -10px;
178+
display: inline;
179+
}
180+
.page-count {
181+
text-align: center;
182+
margin-right: 12px;
156183
}
157-
span:first-child {
184+
.division {
158185
font-size: 19px;
186+
display: inline;
187+
margin-left: 15px;
188+
margin-right: 12px;
189+
text-align: center;
190+
line-height: 30px;
159191
}
160192
}
161193
/deep/ .el-input--small .el-input__inner {

‎src/components/SelectUser/UserItem.vue

Lines changed: 34 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,14 +6,14 @@
66
<template>
77
<div class="user-item-div">
88
<!-- todo 待优化 -->
9-
<div v-if="!(node.key && (node.key.startsWith(moreFlag) || node.key.startsWith(loadingFlag)))" class="checkbox-div">
9+
<div v-if="!isOnlyClick && !(node.key && (node.key.startsWith(moreFlag) || node.key.startsWith(loadingFlag)))" class="checkbox-div">
1010
<el-checkbox :value="checked" :disabled="(isSigleSelect || isOnlyLeaf) && !data.userId" @change="onSelect" @click.stop.native="clickFun" />
1111
</div>
1212
<div v-if="node.key && node.key.startsWith(loadingFlag)" class="ml5"><i class="el-icon-loading" style="font-size: 18px;" /></div>
1313
<div v-else-if="node.key && node.key.startsWith(moreFlag)" :class="`show-more theme-text-color cp ml20 ${loading ? 'disabled-btn' : ''}`" @click="showMore">
1414
<i v-if="loading" class="el-icon-loading mr5" />查看更多
1515
</div>
16-
<div v-else-if="data.userId" class="user-info">
16+
<div v-else-if="data.userId" class="user-info" :data-userId="dealUserId(data.userId)">
1717
<img class="user-avatar" :src="data.avatarMediaid || require('@/assets/image/card-avatar.svg')">
1818
<span>{{ node.label }}</span>
1919
</div>
@@ -84,6 +84,20 @@ export default {
8484
isShowMainDep: {
8585
type: Boolean,
8686
default: false
87+
},
88+
/**
89+
* 是否只能点击
90+
*/
91+
isOnlyClick: {
92+
type: Boolean,
93+
default: false
94+
},
95+
/**
96+
* 是否自动选择父部门下的所有子部门
97+
*/
98+
depLinkage: {
99+
type: Boolean,
100+
default: false
87101
}
88102
},
89103
data() {
@@ -92,8 +106,6 @@ export default {
92106
loading: false
93107
};
94108
},
95-
computed: {
96-
},
97109
watch: {
98110
userList(val) {
99111
// 好友数据获取到后取消转圈状态
@@ -105,6 +117,16 @@ export default {
105117
this.dealCheckStatus(this.userList);
106118
},
107119
methods: {
120+
// 处理data-userId数据，因为querySelector接口查询属性时不支持数字开头
121+
dealUserId(userId) {
122+
if (!userId) return userId;
123+
const reg = (/[a-zA-Z]/);
124+
const match = userId.match(reg);
125+
if (match) {
126+
return userId.slice(match.index);
127+
}
128+
return userId;
129+
},
108130
/**
109131
* 处理复选框选中状态
110132
*/
@@ -141,6 +163,9 @@ export default {
141163
list.push(this.data);
142164
this.$emit('update:userList', list);
143165
}
166+
if (this.depLinkage) {
167+
this.$emit('dealDepLinkage', this.data, !checkStatus);
168+
}
144169
}
145170
},
146171
/**
@@ -193,4 +218,9 @@ export default {
193218
cursor: not-allowed;
194219
}
195220
}
221+
.popover-info {
222+
div {
223+
cursor: pointer;
224+
}
225+
}
196226
</style>

0 commit comments

Comments
 (0)