提交 2d2ccc1a authored 作者: lihuihui's avatar lihuihui

修改bug

上级 14f93824
...@@ -3,8 +3,8 @@ import httpRequest from '@/utils/axios' ...@@ -3,8 +3,8 @@ import httpRequest from '@/utils/axios'
/** /**
* 消息看板 * 消息看板
*/ */
export function getStatisticsData() { export function getStatisticsData(params) {
return httpRequest.get('/api/message/v1/messages/statistics') return httpRequest.get('/api/message/v1/messages/statistics', { params })
} }
/** /**
* 消息模板列表 * 消息模板列表
......
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
<meta http-equiv="Cache-Control" content="no-cache, no-store, must-revalidate" /> <meta http-equiv="Cache-Control" content="no-cache, no-store, must-revalidate" />
<meta http-equiv="Pragma" content="no-cache" /> <meta http-equiv="Pragma" content="no-cache" />
<meta http-equiv="Expires" content="0" /> <meta http-equiv="Expires" content="0" />
<title>金融数字化营销实操系统</title> <title>紫荆消息总线系统</title>
<meta <meta
name="viewport" name="viewport"
id="viewport" id="viewport"
......
...@@ -55,10 +55,10 @@ ...@@ -55,10 +55,10 @@
</div> </div>
<div class="right-content"> <div class="right-content">
<ul class="tab-btn"> <ul class="tab-btn">
<li v-if="form.step3.find(id => { return id == 1 })" :class="tabIndex == 3 && 'active'" @click="tabChange(3)"><div>邮件</div></li>
<li v-if="form.step3.find(id => { return id == 2 })" :class="tabIndex == 0 && 'active'" @click="tabChange(0)"><div>短信</div></li> <li v-if="form.step3.find(id => { return id == 2 })" :class="tabIndex == 0 && 'active'" @click="tabChange(0)"><div>短信</div></li>
<li v-if="form.step3.find(id => { return id == 4 })" :class="tabIndex == 1 && 'active'" @click="tabChange(1)"><div>公众号</div></li> <li v-if="form.step3.find(id => { return id == 4 })" :class="tabIndex == 1 && 'active'" @click="tabChange(1)"><div>公众号</div></li>
<li v-if="form.step3.find(id => { return id == 3 })" :class="tabIndex == 2 && 'active'" @click="tabChange(2)"><div>钉钉</div></li> <li v-if="form.step3.find(id => { return id == 3 })" :class="tabIndex == 2 && 'active'" @click="tabChange(2)"><div>钉钉</div></li>
<li v-if="form.step3.find(id => { return id == 1 })" :class="tabIndex == 3 && 'active'" @click="tabChange(3)"><div>邮件</div></li>
</ul> </ul>
<ul class="tab-content"> <ul class="tab-content">
<li v-show="tabIndex == 0"> <li v-show="tabIndex == 0">
...@@ -147,10 +147,10 @@ ...@@ -147,10 +147,10 @@
</li> </li>
</ul> </ul>
<ul class="tab-btn"> <ul class="tab-btn">
<li v-if="form.step3.find(id => { return id == 1 })" :class="tabIndex == 3 && 'active'" @click="tabChange(3)"><div>邮件</div></li>
<li v-if="form.step3.find(id => { return id == 2 })" :class="tabIndex == 0 && 'active'" @click="tabChange(0)"><div>短信</div></li> <li v-if="form.step3.find(id => { return id == 2 })" :class="tabIndex == 0 && 'active'" @click="tabChange(0)"><div>短信</div></li>
<li v-if="form.step3.find(id => { return id == 4 })" :class="tabIndex == 1 && 'active'" @click="tabChange(1)"><div>公众号</div></li> <li v-if="form.step3.find(id => { return id == 4 })" :class="tabIndex == 1 && 'active'" @click="tabChange(1)"><div>公众号</div></li>
<li v-if="form.step3.find(id => { return id == 3 })" :class="tabIndex == 2 && 'active'" @click="tabChange(2)"><div>钉钉</div></li> <li v-if="form.step3.find(id => { return id == 3 })" :class="tabIndex == 2 && 'active'" @click="tabChange(2)"><div>钉钉</div></li>
<li v-if="form.step3.find(id => { return id == 1 })" :class="tabIndex == 3 && 'active'" @click="tabChange(3)"><div>邮件</div></li>
</ul> </ul>
</div> </div>
<div class="left-content"> <div class="left-content">
......
...@@ -52,7 +52,7 @@ export default { ...@@ -52,7 +52,7 @@ export default {
}) })
}) })
this.allData = response.data.data this.allData = response.data.data
// this.totalUser = response.data.total this.totalUser = response.data.data.find(item => { return item.id === this.form.step2 }).user_total
}) })
.finally(() => { .finally(() => {
}) })
......
...@@ -17,7 +17,7 @@ ...@@ -17,7 +17,7 @@
<activity :form="form" v-show="active === 0"></activity> <activity :form="form" v-show="active === 0"></activity>
<target-user :form="form" v-show="active === 1"></target-user> <target-user :form="form" v-show="active === 1"></target-user>
<trigger :form="form" v-show="active === 2"></trigger> <trigger :form="form" v-show="active === 2"></trigger>
<send-content :form="form" @clickPrev="clickPrev" @clickNext="clickNext" v-show="active === 3 || active === 4"></send-content> <send-content :form="form" @clickPrev="clickPrev" @clickNext="clickNext" v-if="active === 3 || active === 4"></send-content>
</div> </div>
<div class="foot-btn-box" v-show="active != 3 && active != 4"> <div class="foot-btn-box" v-show="active != 3 && active != 4">
<div class="content"> <div class="content">
......
...@@ -15,8 +15,8 @@ ...@@ -15,8 +15,8 @@
<div class="num">{{ data.message_read_total }}</div> <div class="num">{{ data.message_read_total }}</div>
</div> </div>
</div> </div>
<div class="select-box" v-if="false"> <div class="select-box">
<el-select v-model="value" placeholder="请选择"> <el-select v-model="value" placeholder="请选择" @change="selectChange">
<el-option <el-option
v-for="item in options" v-for="item in options"
:key="item.value" :key="item.value"
...@@ -53,16 +53,28 @@ export default { ...@@ -53,16 +53,28 @@ export default {
data: {}, data: {},
chartList: [], chartList: [],
options: [{ options: [{
value: '1', value: '0',
label: '全部' label: '全部'
}, {
value: '1',
label: '一年'
}, { }, {
value: '2', value: '2',
label: '未读数' label: '半年'
}, { }, {
value: '3', value: '3',
label: '已读数' label: '30天'
}, {
value: '4',
label: '明天'
}, {
value: '5',
label: '今天'
}, {
value: '6',
label: '昨天'
}], }],
value: '' value: '0'
} }
}, },
mounted() { mounted() {
...@@ -70,9 +82,12 @@ export default { ...@@ -70,9 +82,12 @@ export default {
this.getStatisticsData() this.getStatisticsData()
}, },
methods: { methods: {
selectChange() {
this.getStatisticsData()
},
getStatisticsData() { getStatisticsData() {
api api
.getStatisticsData({ level: this.$store.state.level }) .getStatisticsData({ date_type: parseInt(this.value) })
.then(response => { .then(response => {
this.data = response.data this.data = response.data
this.chartList = this.filterData(response.data.statistics_detail) this.chartList = this.filterData(response.data.statistics_detail)
...@@ -132,7 +147,7 @@ export default { ...@@ -132,7 +147,7 @@ export default {
} }
] ]
} }
myChart.setOption(option) myChart.setOption(option, true)
}, },
getName(n) { getName(n) {
const name = { const name = {
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论