Commit 270402bd by 高淑倩

add:articlechart

parent 3c7b19ad
...@@ -4478,7 +4478,8 @@ ...@@ -4478,7 +4478,8 @@
"ansi-regex": { "ansi-regex": {
"version": "2.1.1", "version": "2.1.1",
"bundled": true, "bundled": true,
"dev": true "dev": true,
"optional": true
}, },
"aproba": { "aproba": {
"version": "1.2.0", "version": "1.2.0",
...@@ -4893,7 +4894,8 @@ ...@@ -4893,7 +4894,8 @@
"safe-buffer": { "safe-buffer": {
"version": "5.1.1", "version": "5.1.1",
"bundled": true, "bundled": true,
"dev": true "dev": true,
"optional": true
}, },
"safer-buffer": { "safer-buffer": {
"version": "2.1.2", "version": "2.1.2",
...@@ -4949,6 +4951,7 @@ ...@@ -4949,6 +4951,7 @@
"version": "3.0.1", "version": "3.0.1",
"bundled": true, "bundled": true,
"dev": true, "dev": true,
"optional": true,
"requires": { "requires": {
"ansi-regex": "2.1.1" "ansi-regex": "2.1.1"
} }
...@@ -4992,12 +4995,14 @@ ...@@ -4992,12 +4995,14 @@
"wrappy": { "wrappy": {
"version": "1.0.2", "version": "1.0.2",
"bundled": true, "bundled": true,
"dev": true "dev": true,
"optional": true
}, },
"yallist": { "yallist": {
"version": "3.0.2", "version": "3.0.2",
"bundled": true, "bundled": true,
"dev": true "dev": true,
"optional": true
} }
} }
}, },
......
...@@ -31,8 +31,8 @@ ...@@ -31,8 +31,8 @@
</div> </div>
</el-col> </el-col>
<el-col :span="10" class="articleChart"> <el-col :span="10" class="articleChart">
<!-- {{item.mediaGetarticles[0]}} --> <!-- <ve-line :data="item.tempList" :extend="extend" :tooltip-visible="false" :legend-visible="false"></ve-line> -->
<ve-line :data="chartData" :grid="grid" height="180px" :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-col>
</el-row> </el-row>
</div> </div>
...@@ -68,18 +68,23 @@ export default { ...@@ -68,18 +68,23 @@ export default {
articleList: [] articleList: []
} }
}, },
mounted () { created () {
this.datalist.forEach((item, index) => { this.datalist.forEach((item, index) => {
console.log('index', index) const tempList = []
// console.log('itemall', item.mediaGetarticles) // 拼接 rows
item.mediaGetarticles.forEach(article => { item.mediaGetarticles.forEach(article => {
const { refDate, oriPageReadCount, oriPageReadUser } = article const { refDate, oriPageReadCount, oriPageReadUser } = article
this.chartData.rows.push({ tempList.push({
日期: refDate, '日期': refDate,
图文总阅读人数: oriPageReadUser, '图文总阅读人数': oriPageReadUser,
图文总阅读次数: oriPageReadCount '图文总阅读次数': oriPageReadCount
}) })
}) })
item.tempList = tempList
item.chartData = {
columns: ['日期', '图文总阅读人数', '图文总阅读次数'],
rows: item.tempList
}
}) })
}, },
props: ['datalist'], props: ['datalist'],
...@@ -94,8 +99,6 @@ export default { ...@@ -94,8 +99,6 @@ export default {
background-color #fff background-color #fff
border-top 1px solid #ccc border-top 1px solid #ccc
padding 0 10px padding 0 10px
.articleChart
// background-color pink
.title .title
height 30px height 30px
line-height 30px line-height 30px
......
...@@ -30,26 +30,38 @@ export default { ...@@ -30,26 +30,38 @@ export default {
symbol: 'none', symbol: 'none',
data: [ data: [
{ {
name: '标准1', // name: '标准1',
yAxis: 1 // yAxis: 1
}
], name: 'Y 轴值为 100 的水平线',
itemStyle: { yAxis: 100
normal: {
lineStyle: { // type: 'max',
type: 'solid', // lineStyle: {
color: '#e2d73c ', // normal: {
width: 2 // color: 'green',
}, // width: 2,
label: { // type: 'solid'
formatter: '', // }
textStyle: { // }
fontSize: 16,
fontWeight: 'bolder'
}
}
} }
} ]
// itemStyle: {
// normal: {
// lineStyle: {
// type: 'solid',
// color: '#e2d73c ',
// width: 2
// },
// label: {
// formatter: '',
// textStyle: {
// fontSize: 16,
// fontWeight: 'bolder'
// }
// }
// }
// }
} }
this.extend = { this.extend = {
series: { series: {
......
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
</div> </div>
</el-row> </el-row>
<el-form :inline="true" :model="form" class="demo-form-inline" style="min-width:1480px;"> <el-form :inline="true" :model="form" class="demo-form-inline" style="min-width:1280px;">
<el-row class="temp-input"> <el-row class="temp-input">
<el-col :span="10"> <el-col :span="10">
<el-form-item label="推送名称:"> <el-form-item label="推送名称:">
...@@ -16,10 +16,7 @@ ...@@ -16,10 +16,7 @@
</el-col> </el-col>
<el-col :span="14"> <el-col :span="14">
<el-form-item label="活动时间"> <el-form-item label="活动时间">
<el-date-picker type="date" placeholder="推送时间" v-model="queryDateStart" <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>
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> <span class="line time-line" :span="2">-</span>
<el-date-picker type="date" placeholder="推送时间" v-model="queryDateEnd"></el-date-picker> <el-date-picker type="date" placeholder="推送时间" v-model="queryDateEnd"></el-date-picker>
</el-form-item> </el-form-item>
...@@ -27,14 +24,14 @@ ...@@ -27,14 +24,14 @@
</el-row> </el-row>
<el-row class="temp-input"> <el-row class="temp-input">
<el-col :span="10"> <el-col :span="14">
<el-form-item label="推送人数"> <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> <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-form-item>
</el-col> </el-col>
<el-col :span="14"> <el-col :span="6">
<el-form-item label="创建推送节点:"> <el-form-item label="创建推送节点:">
<el-select v-model="clerkId" placeholder="--全部--"> <el-select v-model="clerkId" placeholder="--全部--">
<el-option v-for="item in options" :key="item.clerkId" :label="item.label" :value="item.clerkId"> <el-option v-for="item in options" :key="item.clerkId" :label="item.label" :value="item.clerkId">
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment