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
690d6ea0
Commit
690d6ea0
authored
Apr 09, 2019
by
caoyanzhi
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
未完成的功能
parent
3d06fc0f
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
61 additions
and
15 deletions
+61
-15
selected-tags-list.vue
src/components/selected-tags-list.vue
+38
-0
memberGroupDetail.vue
src/view/memberGroup/memberGroupDetail.vue
+20
-14
memberGroupEdit.vue
src/view/memberGroup/memberGroupEdit.vue
+3
-1
No files found.
src/components/selected-tags-list.vue
0 → 100644
View file @
690d6ea0
<
template
>
<div
class=
"flex"
>
<ul>
<li
v-for=
"item in tagsList[0]"
:key=
"item.tagId"
></li>
</ul>
<div
v-if=
"tagsList[1] && tagsList[1].length > 0"
>
{{
tagsList
[
1
][
0
].
levelType
===
'or'
?
'或者'
:
tagsList
[
1
][
0
].
levelType
===
'andNot'
?
'剔除'
:
''
}}
</div>
<ul>
<li
v-for=
"item in tagsList[1]"
:key=
"item.tagId"
></li>
</ul>
<div
v-if=
"tagsList[2] && tagsList[2].length > 0"
>
{{
tagsList
[
2
][
0
].
levelType
===
'or'
?
'或者'
:
tagsList
[
2
][
0
].
levelType
===
'andNot'
?
'剔除'
:
''
}}
</div>
<ul>
<li
v-for=
"item in tagsList[2]"
:key=
"item.tagId"
></li>
</ul>
</div>
</
template
>
<
script
>
export
default
{
name
:
'selected-tags-list'
,
props
:
{
tagsList
:
{
type
:
Array
,
required
:
true
}
},
mounted
()
{
setTimeout
(()
=>
{
console
.
log
(
this
.
tagsList
);
},
2000
);
}
};
</
script
>
<
style
lang=
"less"
scoped
></
style
>
src/view/memberGroup/memberGroupDetail.vue
View file @
690d6ea0
...
...
@@ -15,18 +15,17 @@
</span>
</div>
<div
class=
"memberGroupDetail-wrap__head"
>
<div
class=
"flex"
>
<span
class=
"tag-selected-title"
>
筛选标签
</span>
<div
class=
"inline-block tag-cell-wrap flex-1"
>
<template
v-for=
"(item, index) in selectedTagData"
>
<span
v-if=
"index != 0"
class=
"p-lr-18"
:key=
"index"
>
并且
</span>
<span
class=
"tag-cell inline-block border-box color-606266"
:key=
"index + item.tagValueId"
>
<span>
{{
item
.
tagName
}}
</span>
<span
v-if=
"item.tagParams"
>
【选择:
{{
item
.
tagParams
.
selectedVal
.
join
(
','
)
}}
】
</span>
</span>
</
template
>
</div>
</div>
<span
class=
"tag-selected-title"
>
筛选标签
</span>
<!--
<div
class=
"inline-block tag-cell-wrap flex-1"
>
-->
<!--
<template
v-for=
"(item, index) in selectedTagData"
>
-->
<!--
<span
v-if=
"index != 0"
class=
"p-lr-18"
:key=
"index"
>
并且
</span>
-->
<!--
<span
class=
"tag-cell inline-block border-box color-606266"
:key=
"index + item.tagValueId"
>
-->
<!--
<span>
{{
item
.
tagName
}}
</span>
-->
<!--
<span
v-if=
"item.tagParams"
>
【选择:
{{
item
.
tagParams
.
selectedVal
.
join
(
','
)
}}
】
</span>
-->
<!--
</span>
-->
<!--
</
template
>
-->
<selected-tags-list
:tagsList=
"selectedTagData"
/>
<!-- </div>-->
</div>
<div
class=
"memberGroupDetail-wrap__table"
>
<el-table
v-loading=
"loading"
@
sort-change=
"sortChange"
:data=
"memberGroupDetailData"
style=
"width: 100%"
>
...
...
@@ -276,8 +275,11 @@
</template>
<
script
>
// TODO 筛选标签
// TODO 请求数据
// TODO 筛选标签的组件
import
navCrumb
from
'@/components/nav/nav.vue'
;
import
userDefined
from
'@/components/userDefined.vue'
;
import
selectedTagsList
from
'@/components/selected-tags-list.vue'
;
import
errMsg
from
'@/common/js/error'
;
import
{
getRequest
}
from
'@/api/api'
;
export
default
{
...
...
@@ -414,7 +416,10 @@ export default {
list
.
forEach
(
li
=>
{
li
.
tagParams
&&
(
li
.
tagParams
=
JSON
.
parse
(
li
.
tagParams
));
});
that
.
selectedTagData
=
list
;
list
[
0
][
0
].
levelType
=
'or'
;
list
[
1
]
=
list
[
0
];
list
[
2
]
=
list
[
0
];
this
.
selectedTagData
=
list
;
})
.
catch
(
e
=>
{
console
.
log
(
e
,
'error of getTagValueDtoList'
);
...
...
@@ -626,7 +631,8 @@ export default {
},
components
:
{
navCrumb
,
userDefined
userDefined
,
selectedTagsList
}
};
</
script
>
...
...
src/view/memberGroup/memberGroupEdit.vue
View file @
690d6ea0
...
...
@@ -103,9 +103,11 @@
</template>
<
script
>
// TODO 点击添加按添加标签组的功能
/**
* 点击添加标签按钮,将选中的标签数据保存到一个数组中,当弹出层关闭时,将选中的标签赋值给selectedTagData
* 需要实现标签组中添加标签的功能
* 切换标签组之间关系(剔除、或者)的功能
* 解决add-tag-view中的一个SyntaxError错误
* */
import
navCrumb
from
'@/components/nav/nav.vue'
;
import
addTagView
from
'@/components/addTagView.vue'
;
...
...
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