Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
M
memberTag-web
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
memberTag
memberTag-web
Commits
78fc8395
Commit
78fc8395
authored
Dec 25, 2018
by
xiaohai
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
调试插件
parent
0a70ef4e
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
29 additions
and
14 deletions
+29
-14
groupTransfer.vue
src/components/groupTransfer.vue
+20
-12
memberGroupList.vue
src/view/memberGroup/memberGroupList.vue
+9
-2
No files found.
src/components/groupTransfer.vue
View file @
78fc8395
<
template
>
<div
class=
"group-set-transfer"
>
<div
class=
"flex-1 table-container"
>
<div
class=
"flex-1 table-container
select-list
"
>
<div
class=
"input-div"
>
<el-input
class=
"w_100"
placeholder=
"请输入关键字搜索
人群
"
placeholder=
"请输入关键字搜索
分组
"
prefix-icon=
"el-icon-search"
v-model=
"dataSearch"
@
keyup
.
enter
.
native=
"searchEnterFun"
...
...
@@ -107,7 +107,7 @@
<div
class=
"input-div"
>
<el-input
class=
"w_100"
placeholder=
"请输入关键字搜索
人群
"
placeholder=
"请输入关键字搜索
分组
"
prefix-icon=
"el-icon-search"
v-model=
"dataSearchSelected"
clearable
...
...
@@ -132,7 +132,7 @@
label=
"是否实时"
width=
"116px"
>
<
template
slot-scope=
"scope"
>
{{
scope
.
row
.
isRealTime
==
1
?
'实时'
:
'非实时'
}}
{{
scope
.
row
.
isRealTime
==
1
?
'实时'
:
'非实时'
}}
</
template
>
</el-table-column>
</el-table>
...
...
@@ -163,6 +163,10 @@
default
()
{
return
[
'isRealTime'
,
'latestUpdateTime'
,
'updateType'
,
'effectiveStatus'
,
'effectiveDate'
];
}
},
effectiveStatus
:
{
type
:
[
String
,
Number
],
default
:
""
}
},
data
()
{
...
...
@@ -198,7 +202,7 @@
*
*/
let
sign
=
1
;
// 定义默认的向上滚于乡下滚的边界
const
CONDITION
=
((
this
.
scrollHeight
-
this
.
scrollTop
===
this
.
clientHeight
)
&&
const
CONDITION
=
((
this
.
scrollHeight
-
this
.
scrollTop
<
this
.
clientHeight
+
1
)
&&
this
.
scrollTop
>
sign
)
// 注意: && this.scrollTop
if
(
this
.
scrollTop
>
sign
)
{
...
...
@@ -242,7 +246,7 @@
getGroupList
()
{
const
that
=
this
;
that
.
loading
=
true
;
that
.
axios
.
get
(
`
${
that
.
baseUrl
}
/gic-member-tag-web/member-tag-group/findList.json?requestProject=
${
that
.
projectName
}
&pageSize=
${
that
.
pageSize
}
&pageNum=
${
that
.
currentPage
}
&groupName=
${
that
.
dataSearch
}
&effectiveStatus=
${
1
}
`
)
that
.
axios
.
get
(
`
${
that
.
baseUrl
}
/gic-member-tag-web/member-tag-group/findList.json?requestProject=
${
that
.
projectName
}
&pageSize=
${
that
.
pageSize
}
&pageNum=
${
that
.
currentPage
}
&groupName=
${
that
.
dataSearch
}
&effectiveStatus=
${
that
.
effectiveStatus
}
`
)
.
then
(
res
=>
{
if
(
res
.
data
.
errorCode
==
1
)
{
that
.
tableData
=
that
.
tableData
.
concat
(
res
.
data
.
result
.
result
);
...
...
@@ -338,10 +342,12 @@
let
aSet
=
new
Set
(
seleced
);
let
bSet
=
new
Set
(
setection
);
that
.
selectedData
=
seleced
.
concat
(
setection
).
filter
(
v
=>
!
aSet
.
has
(
v
)
||
!
bSet
.
has
(
v
));
// 两数组非交集部分即为剔除后剩下的数据
that
.
staticSelectedData
.
forEach
((
father
,
idx
)
=>
{
let
arr
=
that
.
staticSelectedData
.
slice
(
0
);
arr
.
forEach
((
father
,
idx
)
=>
{
setection
.
forEach
(
son
=>
{
if
(
son
.
memberTagGroupId
==
father
.
memberTagGroupId
)
{
that
.
staticSelectedData
.
splice
(
idx
,
1
);
let
index
=
that
.
staticSelectedData
.
indexOf
(
father
);
that
.
staticSelectedData
.
splice
(
index
,
1
);
}
});
});
...
...
@@ -423,6 +429,7 @@
}
},
mounted
()
{
console
.
log
(
this
.
defaltSelected
,
"defaltSelected"
);
this
.
getGroupList
();
if
(
this
.
defaltSelected
.
length
>
0
)
{
this
.
selectedData
=
this
.
uniqueByGroupId
(
this
.
selectedData
.
concat
(
this
.
defaltSelected
));
// 数组拼接并去重
...
...
@@ -438,11 +445,9 @@
</
script
>
<
style
lang=
"scss"
>
.group-set-transfer
{
display
:
-webkit-box
;
display
:
-webkit-flex
;
display
:
-ms-flexbox
;
display
:
flex
;
width
:
100%
;
min-width
:
712px
;
background
:
#fff
;
padding
:
10px
30px
20px
;
box-sizing
:
border-box
;
...
...
@@ -468,6 +473,9 @@
height
:
100%
;
border
:
1px
solid
#DCDFE6
;
border-radius
:
4px
;
&.select-list
{
min-width
:
230px
;
}
.el-table
tr
{
cursor
:
pointer
;
.h-18
{
...
...
@@ -501,7 +509,7 @@
box-sizing
:
border-box
;
.transfer-icon
{
color
:
#fff
;
font-size
:
20px
;
//
font-size
:
20px
;
margin-left
:
0
;
margin-right
:
0
;
}
...
...
src/view/memberGroup/memberGroupList.vue
View file @
78fc8395
<
template
>
<div
class=
"memberGroupList-wrap common-wrap"
>
<nav-crumb
:navpath=
"navpath"
></nav-crumb>
<!--
<el-dialog
title=
"提示"
:visible
.
sync=
"dialogVisible"
width=
"80%"
>
<group-transfer></group-transfer>
</el-dialog>
-->
<div
class=
"right-content"
>
<div
class=
"right-box"
>
<div
class=
"common-wrap__opt"
>
...
...
@@ -188,11 +194,12 @@
import
timeFormat
from
'@/common/js/timeFormat'
;
import
{
_debounce
}
from
"@/common/js/public"
;
import
{
getRequest
,
postRequest
,
postJson
,
postForm
}
from
'@/api/api'
;
//
import groupTransfer from '@/components/groupTransfer';
import
groupTransfer
from
'@/components/groupTransfer'
;
export
default
{
name
:
'memberGroupList'
,
data
()
{
return
{
dialogVisible
:
true
,
// 面包屑参数
navpath
:
[
{
...
...
@@ -532,7 +539,7 @@
that
.
getGroupList
()
},
components
:
{
//
groupTransfer,
groupTransfer
,
navCrumb
}
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment