Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
C
common-templete
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
汤强勇
common-templete
Commits
270402bd
Commit
270402bd
authored
Nov 07, 2018
by
高淑倩
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
add:articlechart
parent
3c7b19ad
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
60 additions
and
43 deletions
+60
-43
package-lock.json
package-lock.json
+9
-4
ArticleDetails.vue
src/pages/marketing-center/components/ArticleDetails.vue
+14
-11
MaterialDetails.vue
src/pages/marketing-center/components/MaterialDetails.vue
+31
-19
TempList.vue
src/pages/marketing-center/components/TempList.vue
+6
-9
No files found.
package-lock.json
View file @
270402bd
...
...
@@ -4478,7 +4478,8 @@
"ansi-regex"
:
{
"version"
:
"2.1.1"
,
"bundled"
:
true
,
"dev"
:
true
"dev"
:
true
,
"optional"
:
true
},
"aproba"
:
{
"version"
:
"1.2.0"
,
...
...
@@ -4893,7 +4894,8 @@
"safe-buffer"
:
{
"version"
:
"5.1.1"
,
"bundled"
:
true
,
"dev"
:
true
"dev"
:
true
,
"optional"
:
true
},
"safer-buffer"
:
{
"version"
:
"2.1.2"
,
...
...
@@ -4949,6 +4951,7 @@
"version"
:
"3.0.1"
,
"bundled"
:
true
,
"dev"
:
true
,
"optional"
:
true
,
"requires"
:
{
"ansi-regex"
:
"2.1.1"
}
...
...
@@ -4992,12 +4995,14 @@
"wrappy"
:
{
"version"
:
"1.0.2"
,
"bundled"
:
true
,
"dev"
:
true
"dev"
:
true
,
"optional"
:
true
},
"yallist"
:
{
"version"
:
"3.0.2"
,
"bundled"
:
true
,
"dev"
:
true
"dev"
:
true
,
"optional"
:
true
}
}
},
...
...
src/pages/marketing-center/components/ArticleDetails.vue
View file @
270402bd
...
...
@@ -31,8 +31,8 @@
</div>
</el-col>
<el-col
:span=
"10"
class=
"articleChart"
>
<!--
{{
item
.
mediaGetarticles
[
0
]
}}
-->
<ve-line
:data=
"chartData"
:grid=
"grid"
height=
"180px"
:extend=
"extend"
:tooltip-visible=
"false"
:legend
-visible=
"false"
></ve-line>
<!--
<ve-line
:data=
"item.tempList"
:extend=
"extend"
:tooltip-visible=
"false"
:legend-visible=
"false"
></ve-line>
-->
<ve-line
:data=
"item.chartData"
height=
"180px"
:grid=
"grid"
:extend=
"extend"
:tooltip
-visible=
"false"
></ve-line>
</el-col>
</el-row>
</div>
...
...
@@ -68,18 +68,23 @@ export default {
articleList
:
[]
}
},
moun
ted
()
{
crea
ted
()
{
this
.
datalist
.
forEach
((
item
,
index
)
=>
{
cons
ole
.
log
(
'index'
,
index
)
//
console.log('itemall', item.mediaGetarticles)
cons
t
tempList
=
[]
//
拼接 rows
item
.
mediaGetarticles
.
forEach
(
article
=>
{
const
{
refDate
,
oriPageReadCount
,
oriPageReadUser
}
=
article
t
his
.
chartData
.
rows
.
push
({
日期
:
refDate
,
图文总阅读人数
:
oriPageReadUser
,
图文总阅读次数
:
oriPageReadCount
t
empList
.
push
({
'日期'
:
refDate
,
'图文总阅读人数'
:
oriPageReadUser
,
'图文总阅读次数'
:
oriPageReadCount
})
})
item
.
tempList
=
tempList
item
.
chartData
=
{
columns
:
[
'日期'
,
'图文总阅读人数'
,
'图文总阅读次数'
],
rows
:
item
.
tempList
}
})
},
props
:
[
'datalist'
],
...
...
@@ -94,8 +99,6 @@ export default {
background-color
#fff
border-top
1px
solid
#ccc
padding
0
10px
.articleChart
//
background-color
pink
.title
height
30px
line-height
30px
...
...
src/pages/marketing-center/components/MaterialDetails.vue
View file @
270402bd
...
...
@@ -30,26 +30,38 @@ export default {
symbol
:
'none'
,
data
:
[
{
name
:
'标准1'
,
yAxis
:
1
}
],
itemStyle
:
{
normal
:
{
lineStyle
:
{
type
:
'solid'
,
color
:
'#e2d73c '
,
width
:
2
},
label
:
{
formatter
:
''
,
textStyle
:
{
fontSize
:
16
,
fontWeight
:
'bolder'
}
}
}
// name: '标准1',
// yAxis: 1
name
:
'Y 轴值为 100 的水平线'
,
yAxis
:
100
// type: 'max',
// lineStyle: {
// normal: {
// color: 'green',
// width: 2,
// type: 'solid'
// }
// }
}
]
// itemStyle: {
// normal: {
// lineStyle: {
// type: 'solid',
// color: '#e2d73c ',
// width: 2
// },
// label: {
// formatter: '',
// textStyle: {
// fontSize: 16,
// fontWeight: 'bolder'
// }
// }
// }
// }
}
this
.
extend
=
{
series
:
{
...
...
src/pages/marketing-center/components/TempList.vue
View file @
270402bd
...
...
@@ -7,7 +7,7 @@
</div>
</el-row>
<el-form
:inline=
"true"
:model=
"form"
class=
"demo-form-inline"
style=
"min-width:1
4
80px;"
>
<el-form
:inline=
"true"
:model=
"form"
class=
"demo-form-inline"
style=
"min-width:1
2
80px;"
>
<el-row
class=
"temp-input"
>
<el-col
:span=
"10"
>
<el-form-item
label=
"推送名称:"
>
...
...
@@ -16,10 +16,7 @@
</el-col>
<el-col
:span=
"14"
>
<el-form-item
label=
"活动时间"
>
<el-date-picker
type=
"date"
placeholder=
"推送时间"
v-model=
"queryDateStart"
format=
"yyyy-MM-dd HH:mm:ss"
value-format=
"yyyy-MM-dd HH:mm:ss"
></el-date-picker>
<el-date-picker
type=
"date"
placeholder=
"推送时间"
v-model=
"queryDateStart"
format=
"yyyy-MM-dd HH:mm:ss"
value-format=
"yyyy-MM-dd HH:mm:ss"
></el-date-picker>
<span
class=
"line time-line"
:span=
"2"
>
-
</span>
<el-date-picker
type=
"date"
placeholder=
"推送时间"
v-model=
"queryDateEnd"
></el-date-picker>
</el-form-item>
...
...
@@ -27,14 +24,14 @@
</el-row>
<el-row
class=
"temp-input"
>
<el-col
:span=
"1
0
"
>
<el-col
:span=
"1
4
"
>
<el-form-item
label=
"推送人数"
>
<el-input
v-model
.
number=
"pushCountStart"
placeholder=
"请输入推送名称"
></el-input>
<el-input
v-model
.
number=
"pushCountStart"
placeholder=
"请输入推送名称"
style=
"width:210px"
></el-input>
<span
class=
"line time-line"
:span=
"2"
>
-
</span>
<el-input
v-model
.
number=
"pushCountEnd"
placeholder=
"请输入推送名称"
></el-input>
<el-input
v-model
.
number=
"pushCountEnd"
placeholder=
"请输入推送名称"
style=
"width:200px"
></el-input>
</el-form-item>
</el-col>
<el-col
:span=
"
14
"
>
<el-col
:span=
"
6
"
>
<el-form-item
label=
"创建推送节点:"
>
<el-select
v-model=
"clerkId"
placeholder=
"--全部--"
>
<el-option
v-for=
"item in options"
:key=
"item.clerkId"
:label=
"item.label"
:value=
"item.clerkId"
>
...
...
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