Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
A
apaas-ui
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
gzga-jzapi
apaas-ui
Commits
7d0e65fa
Commit
7d0e65fa
authored
Jul 24, 2020
by
徐一鸣
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
新建定向推送调试完成
parent
ba907652
Changes
5
Expand all
Show whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
403 additions
and
187 deletions
+403
-187
src/components/app-build-steps/app-build-step.vue
src/components/app-build-steps/app-build-step.vue
+1
-1
src/components/message-steps/select-service.vue
src/components/message-steps/select-service.vue
+34
-10
src/components/message-steps/select-template.vue
src/components/message-steps/select-template.vue
+11
-1
src/components/message-steps/select-users.vue
src/components/message-steps/select-users.vue
+84
-6
src/components/recommen/screen-type.vue
src/components/recommen/screen-type.vue
+273
-169
No files found.
src/components/app-build-steps/app-build-step.vue
View file @
7d0e65fa
<
template
>
<
template
>
<div
class=
"app_build_step"
v-
if
=
"isActive"
>
<div
class=
"app_build_step"
v-
show
=
"isActive"
>
<slot></slot>
<slot></slot>
</div>
</div>
</
template
>
</
template
>
...
...
src/components/message-steps/select-service.vue
View file @
7d0e65fa
...
@@ -3,6 +3,8 @@
...
@@ -3,6 +3,8 @@
<screen-type
<screen-type
class=
"service_fliter"
class=
"service_fliter"
:data=
"filterList"
:data=
"filterList"
:top_data=
"serviceTypes"
@
topselect=
"changeType"
@
getselect=
"getFilters"
@
getselect=
"getFilters"
></screen-type>
></screen-type>
<div
class=
"service_list apaas_scroll"
>
<div
class=
"service_list apaas_scroll"
>
...
@@ -29,6 +31,23 @@ export default {
...
@@ -29,6 +31,23 @@ export default {
},
},
data
()
{
data
()
{
return
{
return
{
serviceTypes
:
{
name
:
"
服务分类
"
,
arr
:
[
{
id
:
5
,
name
:
"
数据服务
"
,
},
{
id
:
6
,
name
:
"
时空服务
"
,
},
{
id
:
21
,
name
:
"
综合应用服务
"
,
},
],
},
serviceType
:
5
,
// 5:数据服务,6:时空服务,21:综合应用服务
serviceType
:
5
,
// 5:数据服务,6:时空服务,21:综合应用服务
filterList
:
[],
filterList
:
[],
serviceList
:
[],
serviceList
:
[],
...
@@ -63,8 +82,6 @@ export default {
...
@@ -63,8 +82,6 @@ export default {
organizations
:
organizations
[
serviceType
],
organizations
:
organizations
[
serviceType
],
};
};
this
.
filterList
=
[];
this
.
$http
this
.
$http
.
get
(
"
/apaas/serviceapp/v3/servicemarket/profileInfo
"
,
{
.
get
(
"
/apaas/serviceapp/v3/servicemarket/profileInfo
"
,
{
params
:
{
params
:
{
...
@@ -72,6 +89,8 @@ export default {
...
@@ -72,6 +89,8 @@ export default {
},
},
})
})
.
then
(({
data
})
=>
{
.
then
(({
data
})
=>
{
this
.
filterList
=
[];
if
(
data
.
success
==
1
)
{
if
(
data
.
success
==
1
)
{
let
filters
=
data
.
data
;
let
filters
=
data
.
data
;
...
@@ -89,14 +108,6 @@ export default {
...
@@ -89,14 +108,6 @@ export default {
}
}
});
});
},
},
getFilters
(
filters
)
{
this
.
getServiceList
({
serviceName
:
filters
.
word
,
serviceType2s
:
filters
.
serviceTypeInfo
.
join
(),
dataDomains
:
filters
.
serviceDomain
.
join
(),
organizeIds
:
filters
.
organizations
.
join
(),
});
},
getServiceList
(
params
=
{})
{
getServiceList
(
params
=
{})
{
this
.
$http
this
.
$http
.
get
(
"
/apaas/serviceapp/v3/servicemarket/list
"
,
{
.
get
(
"
/apaas/serviceapp/v3/servicemarket/list
"
,
{
...
@@ -111,6 +122,19 @@ export default {
...
@@ -111,6 +122,19 @@ export default {
}
}
});
});
},
},
changeType
(
typeId
)
{
this
.
serviceType
=
typeId
;
this
.
getFilterList
();
this
.
getServiceList
();
},
getFilters
(
filters
)
{
this
.
getServiceList
({
serviceName
:
filters
.
word
,
serviceType2s
:
filters
.
serviceTypeInfo
.
join
(),
dataDomains
:
filters
.
serviceDomain
.
join
(),
organizeIds
:
filters
.
organizations
.
join
(),
});
},
changeValue
(
item
)
{
changeValue
(
item
)
{
if
(
item
.
check
)
{
if
(
item
.
check
)
{
this
.
selected
.
push
(
item
.
data
);
this
.
selected
.
push
(
item
.
data
);
...
...
src/components/message-steps/select-template.vue
View file @
7d0e65fa
<
template
>
<
template
>
<div
class=
"select_template"
>
<div
class=
"select_template"
>
<div
class=
"top_fliter template_fliter"
>
<div
class=
"top_fliter template_fliter"
>
<show-more-filter
class=
"filter_list"
>
<show-more-filter
class=
"filter_list"
ref=
"filters"
>
<div
class=
"filter_item"
>
<div
class=
"filter_item"
>
<span
class=
"filter_title"
>
消息模板搜索:
</span>
<span
class=
"filter_title"
>
消息模板搜索:
</span>
<el-input
<el-input
...
@@ -162,6 +162,16 @@ export default {
...
@@ -162,6 +162,16 @@ export default {
},
},
};
};
},
},
computed
:
{
parentIsActive
()
{
return
this
.
$parent
.
isActive
;
},
},
watch
:
{
parentIsActive
()
{
this
.
$refs
.
filters
.
resize
();
},
},
created
()
{
created
()
{
let
_self
=
this
;
let
_self
=
this
;
...
...
src/components/message-steps/select-users.vue
View file @
7d0e65fa
<
template
>
<
template
>
<div
class=
"selected_user"
>
<div
class=
"selected_user"
>
<p
class=
"selected_title"
>
目标用户:
</p>
<p
class=
"selected_title"
>
目标用户:
</p>
<div
class=
"selected_list"
>
<div
class=
"selected_list"
ref=
"selectedList"
>
<span
class=
"selected_item"
v-for=
"item in selectedList"
:key=
"item.id"
>
<template
v-for=
"(item, index) in selectedList"
>
<span
class=
"selected_more"
v-if=
"index + 1 === selectedList.length && showSelectedMore"
:key=
"'last_' + index"
>
...
</span
>
<span
class=
"selected_item"
:key=
"item.id"
>
<span
v-text=
"item.label"
></span>
<span
v-text=
"item.label"
></span>
<i
class=
"el-icon-close"
@
click=
"deleteItem(item)"
></i>
<i
class=
"el-icon-close"
@
click=
"deleteItem(item)"
></i>
</span>
</span>
</
template
>
</div>
</div>
<div
class=
"user_list apass_checkbox"
>
<div
class=
"user_list apass_checkbox"
>
<el-input
<el-input
...
@@ -41,11 +49,19 @@ export default {
...
@@ -41,11 +49,19 @@ export default {
label
:
"
label
"
,
label
:
"
label
"
,
},
},
selectedList
:
[],
selectedList
:
[],
showSelectedMore
:
false
,
};
};
},
},
created
()
{
created
()
{
this
.
getTargetUserList
();
this
.
getTargetUserList
();
},
},
mounted
()
{
this
.
selectedListResize
();
window
.
addEventListener
(
"
resize
"
,
this
.
selectedListResize
);
},
destroyed
()
{
window
.
removeEventListener
(
"
resize
"
,
this
.
selectedListResize
);
},
methods
:
{
methods
:
{
getTargetUserList
()
{
getTargetUserList
()
{
this
.
$http
this
.
$http
...
@@ -152,10 +168,59 @@ export default {
...
@@ -152,10 +168,59 @@ export default {
}
}
});
});
this
.
selectedListResize
();
// console.log(users);
// console.log(users);
this
.
$emit
(
"
change
"
,
users
);
this
.
$emit
(
"
change
"
,
users
);
},
},
selectedListResize
()
{
this
.
$nextTick
(()
=>
{
let
container
=
this
.
$refs
.
selectedList
;
let
containerWidth
=
container
.
getBoundingClientRect
().
width
-
10
;
let
items
=
container
.
querySelectorAll
(
"
.selected_item
"
);
let
itemsLength
=
items
.
length
;
let
itemsWidth
=
[];
let
totalWidth
=
0
;
if
(
items
.
length
<
1
)
{
return
;
}
this
.
showSelectedMore
=
false
;
for
(
let
i
=
0
;
i
<
itemsLength
;
i
++
)
{
let
item
=
items
[
i
];
let
itemWidth
=
0
;
item
.
style
.
display
=
"
inline-block
"
;
itemWidth
=
Math
.
ceil
(
item
.
getBoundingClientRect
().
width
)
+
10
;
itemsWidth
.
push
(
itemWidth
);
totalWidth
+=
itemWidth
;
if
(
totalWidth
>
containerWidth
)
{
this
.
showSelectedMore
=
true
;
}
}
if
(
this
.
showSelectedMore
)
{
let
showItemWidth
=
itemsWidth
[
itemsLength
-
1
]
+
30
;
// 最后一个元素的宽度 + 省略号的宽度
for
(
let
i
=
0
;
i
<
itemsLength
-
1
;
i
++
)
{
let
item
=
items
[
i
];
showItemWidth
+=
itemsWidth
[
i
];
if
(
showItemWidth
>
containerWidth
)
{
item
.
style
.
display
=
"
none
"
;
}
}
}
});
},
},
},
};
};
</
script
>
</
script
>
...
@@ -178,13 +243,14 @@ export default {
...
@@ -178,13 +243,14 @@ export default {
}
}
.selected_list
{
.selected_list
{
flex-shrink
:
0
;
flex-shrink
:
0
;
min-
height
:
44px
;
height
:
44px
;
padding
:
4px
;
padding
:
4px
;
border
:
1px
solid
#e3e5ef
;
border
:
1px
solid
#e3e5ef
;
box-sizing
:
border-box
;
box-sizing
:
border-box
;
border-radius
:
7px
;
border-radius
:
7px
;
overflow
:
hidden
;
overflow
:
hidden
;
margin-top
:
10px
;
margin-top
:
10px
;
font-size
:
0
;
}
}
.selected_list
.selected_item
{
.selected_list
.selected_item
{
display
:
inline-block
;
display
:
inline-block
;
...
@@ -193,10 +259,22 @@ export default {
...
@@ -193,10 +259,22 @@ export default {
border-radius
:
3px
;
border-radius
:
3px
;
overflow
:
hidden
;
overflow
:
hidden
;
padding
:
0
5px
;
padding
:
0
5px
;
box-sizing
:
border-box
;
min-width
:
20px
;
margin
:
5px
;
font-size
:
12px
;
line-height
:
24px
;
color
:
#0f2683
;
}
.selected_more
{
display
:
inline-block
;
vertical-align
:
middle
;
width
:
20px
;
margin
:
5px
;
margin
:
5px
;
font-size
:
12px
;
font-size
:
12px
;
line-height
:
24px
;
line-height
:
24px
;
color
:
#0f2683
;
color
:
#0f2683
;
text-align
:
center
;
}
}
.selected_list
.selected_item
>
i
{
.selected_list
.selected_item
>
i
{
cursor
:
pointer
;
cursor
:
pointer
;
...
...
src/components/recommen/screen-type.vue
View file @
7d0e65fa
This diff is collapsed.
Click to expand it.
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