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
e663f987
Commit
e663f987
authored
May 11, 2022
by
liuchenxi
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
update: ui调整
parent
a0169f7e
Hide whitespace changes
Inline
Side-by-side
Showing
10 changed files
with
90 additions
and
34 deletions
+90
-34
tag-config-options.vue
src/components/tag/tag-config-options.vue
+1
-1
manual-tag-value-edit.vue
src/view/manualTag/manual-tag-value-edit.vue
+17
-4
card-item.vue
src/view/memberGroup/card-item.vue
+1
-0
edit-tag.vue
src/view/memberGroup/edit-tag.vue
+18
-6
group-list.vue
src/view/memberGroup/group-list.vue
+3
-4
memberGroupEdit.vue
src/view/memberGroup/memberGroupEdit.vue
+13
-8
memberGroupList.vue
src/view/memberGroup/memberGroupList.vue
+2
-0
tag-container-active.vue
src/view/platformTag/tag-container-active.vue
+17
-5
tag-container.vue
src/view/platformTag/tag-container.vue
+17
-5
index.less
static/css/index.less
+1
-1
No files found.
src/components/tag/tag-config-options.vue
View file @
e663f987
...
@@ -2724,7 +2724,7 @@ export default {
...
@@ -2724,7 +2724,7 @@ export default {
}
}
.tag013check
{
.tag013check
{
width
:
180px
;
width
:
180px
;
margin-left
:
0
;
margin-left
:
0
!important
;
margin-right
:
20px
;
margin-right
:
20px
;
.el-checkbox__label
{
.el-checkbox__label
{
overflow
:
hidden
;
overflow
:
hidden
;
...
...
src/view/manualTag/manual-tag-value-edit.vue
View file @
e663f987
...
@@ -76,7 +76,7 @@
...
@@ -76,7 +76,7 @@
></vue-gic-export-excel>
></vue-gic-export-excel>
<!--表格字段-->
<!--表格字段-->
<dm-table-filed
:visible
.
sync=
"tableFiledVisible"
projectName=
"member-tag"
pageName=
"memberTag"
:max=
"20"
:defaultDisabled=
"['memberName']"
:checkedFields=
"checkFields"
@
submit=
"onSubmiTableFiled"
/>
<dm-table-filed
:visible
.
sync=
"tableFiledVisible"
projectName=
"member-tag"
pageName=
"memberTag"
:max=
"20"
:defaultDisabled=
"['memberName']"
:checkedFields=
"checkFields"
@
submit=
"onSubmiTableFiled"
/>
<i
id=
"aniIcon"
class=
"iconfont icon-
shougong
biaoqian aniIcon"
:style=
"{ right: `${animationPos.x}px`, bottom: `${animationPos.y}px` }"
></i>
<i
id=
"aniIcon"
class=
"iconfont icon-biaoqian aniIcon"
:style=
"{ right: `${animationPos.x}px`, bottom: `${animationPos.y}px` }"
></i>
<delete-tag-dialog
:visible
.
sync=
"deleteTagDialog.visible"
:data=
"deleteTagDialog.deleteData"
@
submit=
"delTagApi"
/>
<delete-tag-dialog
:visible
.
sync=
"deleteTagDialog.visible"
:data=
"deleteTagDialog.deleteData"
@
submit=
"delTagApi"
/>
</div>
</div>
</template>
</template>
...
@@ -642,10 +642,23 @@ export default {
...
@@ -642,10 +642,23 @@ export default {
0
%
{
0
%
{
opacity
:
1
;
opacity
:
1
;
}
}
40
%
{
opacity
:
1
;
right
:
50px
;
bottom
:
360px
;
transform
:
scale
(
0.5
);
}
50
%
{
opacity
:
0.5
;
right
:
50px
;
bottom
:
360px
;
transform
:
scale
(
1.2
);
}
100
%
{
100
%
{
right
:
30px
;
opacity
:
0.5
;
bottom
:
380px
;
right
:
50px
;
font-size
:
12px
;
bottom
:
360px
;
transform
:
scale
(
0
);
}
}
}
}
.tip
{
.tip
{
...
...
src/view/memberGroup/card-item.vue
View file @
e663f987
...
@@ -51,6 +51,7 @@ export default {
...
@@ -51,6 +51,7 @@ export default {
color
:
#2f54eb
;
color
:
#2f54eb
;
font-size
:
22px
;
font-size
:
22px
;
white-space
:
nowrap
;
white-space
:
nowrap
;
font-family
:
DINAlternate-Bold
,
DINAlternate
;
span
{
span
{
font-size
:
14px
;
font-size
:
14px
;
color
:
#303133
;
color
:
#303133
;
...
...
src/view/memberGroup/edit-tag.vue
View file @
e663f987
...
@@ -24,7 +24,7 @@
...
@@ -24,7 +24,7 @@
<el-button
ref=
"animationStart"
type=
"primary"
@
click=
"handleSave"
style=
"margin-bottom: 14px"
>
确 定
</el-button>
<el-button
ref=
"animationStart"
type=
"primary"
@
click=
"handleSave"
style=
"margin-bottom: 14px"
>
确 定
</el-button>
</span>
</span>
</el-dialog>
</el-dialog>
<i
id=
"aniIcon"
class=
"iconfont icon-
shougong
biaoqian aniIcon"
:style=
"
{ right: `${animationPos.x}px`, bottom: `${animationPos.y}px` }">
</i>
<i
id=
"aniIcon"
class=
"iconfont icon-biaoqian aniIcon"
:style=
"
{ right: `${animationPos.x}px`, bottom: `${animationPos.y}px` }">
</i>
</div>
</div>
</
template
>
</
template
>
...
@@ -193,18 +193,30 @@ export default {
...
@@ -193,18 +193,30 @@ export default {
z-index
:
99999
;
z-index
:
99999
;
color
:
#2F54EB
;
color
:
#2F54EB
;
font-size
:
26px
;
font-size
:
26px
;
animation
:
toTrash
2s
infinite
;
animation
:
toTrash
3s
;
opacity
:
0
;
opacity
:
0
;
}
}
@keyframes
toTrash
{
@keyframes
toTrash
{
0
%
{
0
%
{
opacity
:
1
;
opacity
:
1
;
}
}
40
%
{
opacity
:
1
;
right
:
55px
;
bottom
:
285px
;
transform
:
scale
(
0.5
);
}
50
%
{
opacity
:
0.5
;
right
:
55px
;
bottom
:
285px
;
transform
:
scale
(
1.2
);
}
100
%
{
100
%
{
right
:
30px
;
opacity
:
0.5
;
bottom
:
300
px
;
right
:
55
px
;
font-size
:
12
px
;
bottom
:
285
px
;
opacity
:
0
;
transform
:
scale
(
0
)
;
}
}
}
}
</
style
>
</
style
>
...
...
src/view/memberGroup/group-list.vue
View file @
e663f987
...
@@ -18,11 +18,9 @@
...
@@ -18,11 +18,9 @@
<ul
class=
"lists"
v-show=
"activeType == '3'"
>
<ul
class=
"lists"
v-show=
"activeType == '3'"
>
<li
v-for=
"(list, i) in groupLists"
:key=
"i"
:class=
"['member-list',
{ 'active-li': i == currentLevelIndex }]" @click="handleChangeLevel(i, list)">
<li
v-for=
"(list, i) in groupLists"
:key=
"i"
:class=
"['member-list',
{ 'active-li': i == currentLevelIndex }]" @click="handleChangeLevel(i, list)">
<div
class=
"wrap"
>
<div
class=
"wrap"
>
<el-tooltip
class=
"item"
effect=
"dark"
:content=
"list.aliasName | aliasTips"
placement=
"top-start"
:open-delay=
"300"
>
<span>
{{
list
.
aliasName
}}
</span>
<span>
{{
list
.
aliasName
}}
</span>
</el-tooltip>
<span>
(
{{
levelNums
(
list
.
aliasName
)
}}
)
</span>
<span>
(
{{
levelNums
(
list
.
aliasName
)
}}
)
</span>
</div>
</div>
</li>
</li>
</ul>
</ul>
<ul
class=
"lists"
v-show=
"activeType == '2'"
>
<ul
class=
"lists"
v-show=
"activeType == '2'"
>
...
@@ -531,6 +529,7 @@ export default {
...
@@ -531,6 +529,7 @@ export default {
}
}
.wrap
span
{
.wrap
span
{
padding-left
:
6px
;
padding-left
:
6px
;
color
:
#303133
;
}
}
li
:hover
{
li
:hover
{
background-color
:
#EBEFFE
;
background-color
:
#EBEFFE
;
...
...
src/view/memberGroup/memberGroupEdit.vue
View file @
e663f987
...
@@ -236,12 +236,17 @@ import {
...
@@ -236,12 +236,17 @@ import {
isShowSystemTag
isShowSystemTag
}
from
'@/request/api'
;;
}
from
'@/request/api'
;;
let
fixBeginTime
=
+
new
Date
()
+
(
1000
*
60
*
60
*
24
);
let
fixBeginTime
=
+
new
Date
()
+
(
1000
*
60
*
60
*
24
);
const
shortTimeFn
=
(
text
,
timestamp
)
=>
{
const
shortTimeFn
=
(
text
,
day
,
type
)
=>
{
return
{
return
{
text
,
text
,
onClick
(
picker
)
{
onClick
(
picker
)
{
const
curDate
=
new
Date
();
let
curDate
=
new
Date
();
curDate
.
setTime
(
curDate
.
getTime
()
+
timestamp
);
if
(
type
==
'day'
)
{
curDate
.
setDate
(
day
+
curDate
.
getDate
());
}
else
{
curDate
.
setMonth
(
day
+
curDate
.
getMonth
());
curDate
=
new
Date
(
+
new
Date
(
curDate
)
-
24
*
60
*
60
*
1000
);
}
picker
.
$emit
(
'pick'
,
curDate
);
picker
.
$emit
(
'pick'
,
curDate
);
}
}
}
}
...
@@ -311,11 +316,11 @@ export default {
...
@@ -311,11 +316,11 @@ export default {
return
time
.
getTime
()
<
Date
.
now
()
-
8.64e7
||
time
.
getTime
()
>
y
;
return
time
.
getTime
()
<
Date
.
now
()
-
8.64e7
||
time
.
getTime
()
>
y
;
},
},
shortcuts
:
[
shortcuts
:
[
shortTimeFn
(
'一天'
,
0
),
shortTimeFn
(
'一天'
,
0
,
'day'
),
shortTimeFn
(
'一周'
,
6
*
24
*
60
*
60
*
1000
),
shortTimeFn
(
'一周'
,
6
,
'day'
),
shortTimeFn
(
'一个月'
,
29
*
24
*
60
*
60
*
1000
),
shortTimeFn
(
'一个月'
,
1
,
'month'
),
shortTimeFn
(
'三个月'
,
89
*
24
*
60
*
60
*
1000
),
shortTimeFn
(
'三个月'
,
3
,
'month'
),
shortTimeFn
(
'六个月'
,
179
*
24
*
60
*
60
*
1000
),
shortTimeFn
(
'六个月'
,
6
,
'month'
),
]
]
},
},
fixedTimeOptions
:
{
fixedTimeOptions
:
{
...
...
src/view/memberGroup/memberGroupList.vue
View file @
e663f987
...
@@ -1620,6 +1620,8 @@ export default {
...
@@ -1620,6 +1620,8 @@ export default {
}
}
}
}
.look-self
{
.look-self
{
display
:
inline-block
;
margin-top
:
10px
;
i
{
i
{
font-size
:
14px
;
font-size
:
14px
;
margin-left
:
5px
;
margin-left
:
5px
;
...
...
src/view/platformTag/tag-container-active.vue
View file @
e663f987
...
@@ -55,7 +55,7 @@
...
@@ -55,7 +55,7 @@
</el-table-column>
</el-table-column>
</el-table>
</el-table>
<delete-tag-dialog
:visible
.
sync=
"deleteTagDialog.visible"
:data=
"deleteTagDialog.deleteData"
@
submit=
"doDelete"
/>
<delete-tag-dialog
:visible
.
sync=
"deleteTagDialog.visible"
:data=
"deleteTagDialog.deleteData"
@
submit=
"doDelete"
/>
<i
id=
"activeAniIcon"
class=
"iconfont icon-
shougong
biaoqian activeAniIcon"
:style=
"{ right: `${animationPos.x}px`, bottom: `${animationPos.y}px` }"
></i>
<i
id=
"activeAniIcon"
class=
"iconfont icon-biaoqian activeAniIcon"
:style=
"{ right: `${animationPos.x}px`, bottom: `${animationPos.y}px` }"
></i>
</div>
</div>
</template>
</template>
...
@@ -257,11 +257,23 @@ export default {
...
@@ -257,11 +257,23 @@ export default {
0
%
{
0
%
{
opacity
:
1
;
opacity
:
1
;
}
}
40
%
{
opacity
:
1
;
right
:
38px
;
bottom
:
345px
;
transform
:
scale
(
0.5
);
}
50
%
{
opacity
:
0.5
;
right
:
37px
;
bottom
:
345px
;
transform
:
scale
(
1.2
);
}
100
%
{
100
%
{
right
:
30px
;
opacity
:
0.5
;
bottom
:
380
px
;
right
:
37
px
;
font-size
:
12
px
;
bottom
:
345
px
;
opacity
:
0
;
transform
:
scale
(
0
)
;
}
}
}
}
</
style
>
</
style
>
src/view/platformTag/tag-container.vue
View file @
e663f987
...
@@ -75,7 +75,7 @@
...
@@ -75,7 +75,7 @@
</el-table-column>
</el-table-column>
</el-table>
</el-table>
<delete-tag-dialog
:visible
.
sync=
"deleteTagDialog.visible"
:data=
"deleteTagDialog.deleteData"
@
submit=
"doDelete"
/>
<delete-tag-dialog
:visible
.
sync=
"deleteTagDialog.visible"
:data=
"deleteTagDialog.deleteData"
@
submit=
"doDelete"
/>
<i
id=
"tagAniIcon"
class=
"iconfont icon-
shougong
biaoqian tagAniIcon"
:style=
"{ right: `${animationPos.x}px`, bottom: `${animationPos.y}px` }"
></i>
<i
id=
"tagAniIcon"
class=
"iconfont icon-biaoqian tagAniIcon"
:style=
"{ right: `${animationPos.x}px`, bottom: `${animationPos.y}px` }"
></i>
</div>
</div>
</template>
</template>
...
@@ -326,11 +326,23 @@ export default {
...
@@ -326,11 +326,23 @@ export default {
0
%
{
0
%
{
opacity
:
1
;
opacity
:
1
;
}
}
40
%
{
opacity
:
1
;
right
:
38px
;
bottom
:
345px
;
transform
:
scale
(
0.5
);
}
50
%
{
opacity
:
0.5
;
right
:
37px
;
bottom
:
345px
;
transform
:
scale
(
1.2
);
}
100
%
{
100
%
{
right
:
30px
;
opacity
:
0.5
;
bottom
:
380
px
;
right
:
37
px
;
font-size
:
12
px
;
bottom
:
345
px
;
opacity
:
0
;
transform
:
scale
(
0
)
;
}
}
}
}
</
style
>
</
style
>
static/css/index.less
View file @
e663f987
...
@@ -75,7 +75,7 @@
...
@@ -75,7 +75,7 @@
.cre-dialog {
.cre-dialog {
.el-dialog__body {
.el-dialog__body {
padding: 10px 20px 2
0
px;
padding: 10px 20px 2
4
px;
}
}
.cre-btn {
.cre-btn {
padding-top: 20px;
padding-top: 20px;
...
...
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