Commit 225c98bd authored by 张伯涛's avatar 张伯涛

bug调整

parent 4140bad1
...@@ -527,7 +527,7 @@ export default { ...@@ -527,7 +527,7 @@ export default {
deptChildren: [], deptChildren: [],
// 表单参数 // 表单参数
form: { form: {
deptId: null, deptId: '',
username: '', username: '',
phone: '', phone: '',
email: '', email: '',
...@@ -650,7 +650,7 @@ export default { ...@@ -650,7 +650,7 @@ export default {
}, },
created() { created() {
// 分页参数初始化为{"page":1,"rows":10},如需自定义分页参数,自行修改 // 分页参数初始化为{"page":1,"rows":10},如需自定义分页参数,自行修改
this.queryParams = JSON.parse(getDataCache(this.$route.path)) // 获取存储的筛选项 // this.queryParams = JSON.parse(getDataCache(this.$route.path)) // 获取存储的筛选项
this.roleFunction() this.roleFunction()
this.getList() // 列表查询 this.getList() // 列表查询
this.getDeptList() this.getDeptList()
...@@ -780,7 +780,7 @@ export default { ...@@ -780,7 +780,7 @@ export default {
}, },
// 点击部门空白处 // 点击部门空白处
clickBlank() { clickBlank() {
this.queryParams.deptId = undefined this.queryParams.deptId = ''
this.getList() this.getList()
}, },
handleClick(data) { handleClick(data) {
......
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
<div class="homepage_topTitle">运营报表</div> <div class="homepage_topTitle">运营报表</div>
<div class="titleBottom"> <div class="titleBottom">
<div class="titleBottom_companyName">--{{ companyName }}</div> <div class="titleBottom_companyName">--{{ companyName }}</div>
<el-select class="titleTopSelect" v-model="company" :disabled="!queryShop" filterable placeholder="请选择所属商家" @change="changeCompany"> <el-select v-model="company" class="titleTopSelect" :disabled="!queryShop" filterable placeholder="请选择所属商家" @change="changeCompany">
<el-option <el-option
v-for="(item,index) in deptList" v-for="(item,index) in deptList"
:key="index" :key="index"
...@@ -83,6 +83,9 @@ ...@@ -83,6 +83,9 @@
<el-col :span="24"> <el-col :span="24">
<!-- <v-chart ref="barChart" :options="barData" class="chart section" />--> <!-- <v-chart ref="barChart" :options="barData" class="chart section" />-->
<el-card> <el-card>
<div slot="header" class="clearfix">
<span>代言人推广次数展示:</span>
</div>
<div id="echarts-peoplePromotionFrequency" class="span_1"> <div id="echarts-peoplePromotionFrequency" class="span_1">
<div id="dataCharts_peoplePromotionFrequency" style="height: 20vh" /> <div id="dataCharts_peoplePromotionFrequency" style="height: 20vh" />
</div> </div>
...@@ -94,6 +97,12 @@ ...@@ -94,6 +97,12 @@
<el-col :span="12"> <el-col :span="12">
<!-- <v-chart ref="pieChart" :options="pieData" class="chart section" />--> <!-- <v-chart ref="pieChart" :options="pieData" class="chart section" />-->
<el-card> <el-card>
<div slot="header" class="clearfix">
<div style="display: flex;align-items: center;justify-content: space-between">
<div>文章总推广次数:</div>
<div class="videNum">视频总推广次数:</div>
</div>
</div>
<div id="echarts-textPieChart" class="span_1"> <div id="echarts-textPieChart" class="span_1">
<div id="dataCharts_textPieChart" style="height: 22vh" /> <div id="dataCharts_textPieChart" style="height: 22vh" />
</div> </div>
...@@ -102,6 +111,10 @@ ...@@ -102,6 +111,10 @@
<el-col :span="12"> <el-col :span="12">
<el-card> <el-card>
<div slot="header" class="clearfix">
<span v-if="isActive === '1'">文章推广次数:</span>
<span v-else>视频推广次数:</span>
</div>
<el-row> <el-row>
<div style="float: right"> <div style="float: right">
<el-button <el-button
...@@ -432,6 +445,9 @@ export default { ...@@ -432,6 +445,9 @@ export default {
<!--<script src="./dashboard.js"></script>--> <!--<script src="./dashboard.js"></script>-->
<style rel="stylesheet/scss" lang="scss" scoped> <style rel="stylesheet/scss" lang="scss" scoped>
.videNum{
padding-right: 250px;
}
.activeBtn{ .activeBtn{
background-color: #666; background-color: #666;
color: white; color: white;
......
...@@ -248,7 +248,8 @@ export default { ...@@ -248,7 +248,8 @@ export default {
// window.location.href = `${this.reLocation}/#/` // window.location.href = `${this.reLocation}/#/`
// this.$router.push({ path: `http://main.court.com${this.redirect || "/"}` }); // this.$router.push({ path: `http://main.court.com${this.redirect || "/"}` });
// this.$router.push('/welcome') // this.$router.push('/welcome')
this.$router.push('/controlPlatform/control') // this.$router.push('/controlPlatform/control')
this.$router.push('/dashboard')
}).catch(() => { }).catch(() => {
this.loading = false this.loading = false
this.verify = false this.verify = false
......
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